Bug fixed: refSort were exported (as refObj) also when occurring InHypothesis

and InConclusion.

diff --git a/helm/metadata/create_V7_mowgli/METADATA/lex.yy.c b/helm/metadata/create_V7_mowgli/METADATA/lex.yy.c
index 3f579762842ca6f267f6e8cff924ae0523fea66a..d86e087500fe5f9ff7d3fda43b77508591bff7dd 100644 (file)
--- a/helm/metadata/create_V7_mowgli/METADATA/lex.yy.c
+++ b/helm/metadata/create_V7_mowgli/METADATA/lex.yy.c
@@ -872,7 +872,8 @@ case 13:
 YY_RULE_SETUP
 #line 161 "meta_lex.l"
 {         
-                    if ((position == INTYPE) | (position == MAINHYP))
+                    if (((position == INTYPE) | (position == MAINHYP)) &&
+                       (first_child == HERE))
                      {
                        tmp=(char *)malloc((sizeof('a')*200)); 
                        strcpy(tmp,yytext);
@@ -889,7 +890,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 177 "meta_lex.l"
+#line 178 "meta_lex.l"
 {
                      skip = 1;
                      first_child = AFTER;
@@ -897,7 +898,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 182 "meta_lex.l"
+#line 183 "meta_lex.l"
 { 
                      if (position == INTYPE) /* CONST on the spine */
                         position = INCONCL;
@@ -906,7 +907,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 188 "meta_lex.l"
+#line 189 "meta_lex.l"
 { 
                      if (position == INTYPE) /* MUTIND on the spine */
                         position = INCONCL;
@@ -915,7 +916,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 194 "meta_lex.l"
+#line 195 "meta_lex.l"
 { 
                      if (position == INTYPE) /* MUTCONSTRUCT on the spine */
                         position = INCONCL;
@@ -924,7 +925,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 200 "meta_lex.l"
+#line 201 "meta_lex.l"
 {     
                          if (!skip) {
                             uri=(char *)malloc((sizeof('a')*200)); 
@@ -944,7 +945,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 217 "meta_lex.l"
+#line 218 "meta_lex.l"
 {
                          if ((where == MUTIND) || (where == MUTCONSTRUCT))
                           { strsep(&yytext,&sep);
@@ -969,7 +970,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 239 "meta_lex.l"
+#line 240 "meta_lex.l"
 {
                          if (where == MUTCONSTRUCT)
                           { strsep(&yytext,&sep);
@@ -989,10 +990,10 @@ YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 258 "meta_lex.l"
+#line 259 "meta_lex.l"
 ECHO;
        YY_BREAK
-#line 996 "lex.yy.c"
+#line 997 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -1882,7 +1883,7 @@ int main()
        return 0;
        }
 #endif
-#line 258 "meta_lex.l"
+#line 259 "meta_lex.l"
 
 
  /***************************************************************/
@@ -1895,14 +1896,14 @@ main(int argc, char *argv[])
                    FILE *outrel, *outsort;
 
                    init_symbol_table();
-                   if (!(outrel = fopen("forward_rel.xml","a"))) 
+                   if (!(outrel = fopen("forward_rel.rdf","a"))) 
                      {
-                     fprintf(stderr, "error in opening file forward_rel.xml\n");
+                     fprintf(stderr, "error in openinf file forward_rel.rdf\n");
                       exit(-1);
                      }
-                   if (!(outsort = fopen("forward_sort.xml","a"))) 
+                   if (!(outsort = fopen("forward_sort.rdf","a"))) 
                      {
-                     fprintf(stderr, "error in opening file forward_sort.xml\n");
+                     fprintf(stderr, "error in openinf file forward_rel.rdf\n");
                       exit(-1);
                      }
                    // We process the body

diff --git a/helm/metadata/create_V7_mowgli/METADATA/lex.yy_ind.c b/helm/metadata/create_V7_mowgli/METADATA/lex.yy_ind.c
index acf8e8ab8cb12610a0639948e309eca6d11ee6e3..b661e22d398263b7b687a5bcf92eb0c88ae24d41 100644 (file)
--- a/helm/metadata/create_V7_mowgli/METADATA/lex.yy_ind.c
+++ b/helm/metadata/create_V7_mowgli/METADATA/lex.yy_ind.c
@@ -931,7 +931,8 @@ case 15:
 YY_RULE_SETUP
 #line 210 "meta_lex_ind.l"
 {         
-                    if ((position == INTYPE) | (position == MAINHYP))
+                    if (((position == INTYPE) | (position == MAINHYP)) &&
+                       (first_child == HERE))
                      {
                        tmp=(char *)malloc((sizeof('a')*200)); 
                        strcpy(tmp,yytext);
@@ -948,7 +949,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 226 "meta_lex_ind.l"
+#line 227 "meta_lex_ind.l"
 {
                      skip = 1;
                      first_child = AFTER;
@@ -956,7 +957,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 231 "meta_lex_ind.l"
+#line 232 "meta_lex_ind.l"
 { 
                      if (position == INTYPE) /* CONST on the spine */
                         position = INCONCL;
@@ -965,7 +966,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 237 "meta_lex_ind.l"
+#line 238 "meta_lex_ind.l"
 { 
                      if (position == INTYPE) /* MUTIND on the spine */
                         position = INCONCL;
@@ -974,7 +975,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 243 "meta_lex_ind.l"
+#line 244 "meta_lex_ind.l"
 { 
                      if (position == INTYPE) /* MUTCONSTRUCT on the spine */
                         position = INCONCL;
@@ -983,7 +984,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 249 "meta_lex_ind.l"
+#line 250 "meta_lex_ind.l"
 {     
                          if (!skip) {
                             uri=(char *)malloc((sizeof('a')*200)); 
@@ -1003,7 +1004,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 266 "meta_lex_ind.l"
+#line 267 "meta_lex_ind.l"
 {
                          if ((where == MUTIND) || (where == MUTCONSTRUCT))
                           { strsep(&yytext,&sep);
@@ -1028,7 +1029,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 288 "meta_lex_ind.l"
+#line 289 "meta_lex_ind.l"
 {
                          if (where == MUTCONSTRUCT)
                           { strsep(&yytext,&sep);
@@ -1048,10 +1049,10 @@ YY_RULE_SETUP
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 307 "meta_lex_ind.l"
+#line 308 "meta_lex_ind.l"
 ECHO;
        YY_BREAK
-#line 1055 "lex.yy_ind.c"
+#line 1056 "lex.yy_ind.c"
 case YY_STATE_EOF(INITIAL):
        yyterminate();
 
@@ -1941,7 +1942,7 @@ int main()
        return 0;
        }
 #endif
-#line 307 "meta_lex_ind.l"
+#line 308 "meta_lex_ind.l"
 
 
  /***************************************************************/
@@ -1969,14 +1970,14 @@ print_file()
                      fprintf(stderr, "error in openinf file %s\n", filename);
                       exit(-1);
                      } 
-                   if (!(outrel = fopen("forward_rel.xml","a"))) 
+                   if (!(outrel = fopen("forward_rel.rdf","a"))) 
                      {
-                     fprintf(stderr, "error in opening file forward_rel.xml\n");
+                     fprintf(stderr, "error in openinf file forward_rel.rdf\n");
                       exit(-1);
                      }
-                   if (!(outsort = fopen("forward_sort.xml","a"))) 
+                   if (!(outsort = fopen("forward_sort.rdf","a"))) 
                      {
-                     fprintf(stderr, "error in opening file forward_sort.xml\n");
+                     fprintf(stderr, "error in openinf file forward_rel.rdf\n");
                       exit(-1);
                      }
                  

diff --git a/helm/metadata/create_V7_mowgli/METADATA/meta_lex.l b/helm/metadata/create_V7_mowgli/METADATA/meta_lex.l
index df0977f6caba90f8db1c620ff77a1f8f437f0a44..94806717e3bb335664921afab1dc667424984bb2 100644 (file)
--- a/helm/metadata/create_V7_mowgli/METADATA/meta_lex.l
+++ b/helm/metadata/create_V7_mowgli/METADATA/meta_lex.l
@@ -159,7 +159,8 @@ value                   [^"]+
                    }
 
 "<SORT"(" "|\n)+"value=\""{value}   {         
-                    if ((position == INTYPE) | (position == MAINHYP))
+                    if (((position == INTYPE) | (position == MAINHYP)) &&
+                       (first_child == HERE))
                      {
                        tmp=(char *)malloc((sizeof('a')*200)); 
                        strcpy(tmp,yytext);

diff --git a/helm/metadata/create_V7_mowgli/METADATA/meta_lex_ind.l b/helm/metadata/create_V7_mowgli/METADATA/meta_lex_ind.l
index a7a62666f64219d6ea4ea293935f50645e2682e2..eac2f771cea7b816711f71c4d279904980c94f45 100644 (file)
--- a/helm/metadata/create_V7_mowgli/METADATA/meta_lex_ind.l
+++ b/helm/metadata/create_V7_mowgli/METADATA/meta_lex_ind.l
@@ -208,7 +208,8 @@ value                   [^"]+
                    }
 
 "<SORT"(" "|\n)+"value=\""{value}   {         
-                    if ((position == INTYPE) | (position == MAINHYP))
+                    if (((position == INTYPE) | (position == MAINHYP)) &&
+                       (first_child == HERE))
                      {
                        tmp=(char *)malloc((sizeof('a')*200)); 
                        strcpy(tmp,yytext);