Changeset 3544

Timestamp:

Oct 29, 2013, 8:47:18 PM (5 years ago)

Author:

shiyangy

Message:

test file generator updated

Location:

proto/xmlschema

Files:

• test/shiporder_gen.py (added)
• validation_template_onevec_shiporder.cpp (modified) (7 diffs)

proto/xmlschema/validation_template_onevec_shiporder.cpp

@@ -121 +121 @@
 int buffer_last;
 FILE *gid_writein;
+FILE *element_out;
 #define ELEMENT_BUFFER_SIZE 30
 char element_name_buffer[ELEMENT_BUFFER_SIZE];
@@ -708 +709 @@
 //                      cout << "2" << endl;
 //                      cout << elem_vec_stack.top()<<endl;
-if(Content_gather && Content_model){
+if(Content_model){
                                 if(!(gid_vec[current_depth].empty())){
 //                                      if(gid_vec.back() != 0){
@@ -839 +840 @@
                         //      s2 = s2 & (s2 - 1);
                         //}
-if(Content_gather && Content_model){
+if(Content_model){
                                 if (gid != 0){
                                         gid_vec[current_depth].push_back(gid);
@@ -1125 +1126 @@
 
 static inline void validate_mul_block(){
+        FILE *element_out = fopen("element.out","w");
         struct Elem elem;
         Validation_2 validation_2;
@@ -1144 +1146 @@
         }
 #endif
+        for(j=0;j<MAX_COUNT;j++){
+                int lgth = gid_vec[j].size();
+                if (lgth == 0){
+                        break;
+                }
+                fprintf(element_out,"%d\n",lgth);
+        }
+        fclose(element_out);
         int lgth;
         for(j=0;j<MAX_COUNT;j++){
@@ -2079 +2089 @@
                         Content_model = 1;
                         Datatype = 0;
-                        Content_gather = 1;
+                        Content_gather = 0;
                 }else if(strcmp(argv[3],"-d")==0){
                         Symbol = 1;
@@ -2113 +2123 @@
         //validate();
 //#ifdef CONTENT_MODEL
-        if(Symbol && Content_model && !Content_gather)
+        if(Symbol && Content_model && !Content_gather){
                 validate_mul_block();
+        }
 //#endif
         PERF_SEC_DUMP(parser_timer);