Changeset 29515 for branches/eam_branches/ipp-20100823/ippToPsps/perl/pspsSchema2xml.pl

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippToPsps/perl/pspsSchema2xml.pl (modified) (6 diffs)

branches/eam_branches/ipp-20100823/ippToPsps/perl/pspsSchema2xml.pl

@@ -50 +50 @@
 
 
-my $output = new IO::File(">tables.xml");
-my $writer = new XML::Writer(OUTPUT => $output, DATA_MODE => 1, DATA_INDENT=>2);
-$writer->xmlDecl('UTF-8');
-#    $writer->doctype('manifest', "", "psps-manifest.dtd");
-$writer->startTag('tableDescriptions', "type" => "$type");
+my $tablesOutput = new IO::File(">tables.xml");
+my $tablesWriter = new XML::Writer(OUTPUT => $tablesOutput, DATA_MODE => 1, DATA_INDENT=>2);
+$tablesWriter->xmlDecl('UTF-8');
+$tablesWriter->startTag('tableDescriptions', "type" => "$type");
+
+my $mapOutput = new IO::File(">map.xml");
+my $mapWriter = new XML::Writer(OUTPUT => $mapOutput, DATA_MODE => 1, DATA_INDENT=>2);
+$mapWriter->xmlDecl('UTF-8');
+$mapWriter->startTag('tabledata', "type" => "$type");
 
 if ($type eq "init") {createInit();}
@@ -63 +67 @@
 
 # finish up XML
-$writer->endTag();
-$writer->end();
+$tablesWriter->endTag();
+$tablesWriter->end();
+
+# finish up XML
+$mapWriter->endTag();
+$mapWriter->end();
 
 print OUT "\n#endif";
@@ -164 +172 @@
     parseTable("StackMeta");
     parseTable("StackDetection");
-    parseTable("SkinnyObject");
-    parseTable("StackOrphan");
-    parseTable("ObjectCalColor");
+    parseTable("StackApFlx");
+    parseTable("StackModelFit");
+    parseTable("StackToImage");
 }
 
@@ -197 +205 @@
 
     print OUT "\ntypedef enum {\n";
-    $writer->startTag('table', "name" => $tableNameOut);
+    $tablesWriter->startTag('table', "name" => $tableNameOut);
+    $mapWriter->startTag('table', 
+            "name" => $tableNameOut,
+            "ippfitsextension" => "");
 
     open (SCHEMA, $path);
@@ -240 +251 @@
 
     if (!$found) {print "Could not find table '$tableName'\n";}
-    $writer->endTag();
+    $tablesWriter->endTag();
+    $mapWriter->endTag();
     print OUT "} ".$tableNameOut.";\n";
 
@@ -326 +338 @@
     print OUT "  ".uc($tableName)."_".uc($name)." = ".$colNum.",\n";
 
-    $writer->startTag('column',
+    $tablesWriter->startTag('column',
             "name" => $name,
             "type" => $type,
             "default" => $default,
             "comment" => $comment);
-
-    $writer->endTag();
+    $tablesWriter->endTag();
+
+    $mapWriter->comment(" <map pspsName=\"$name\" ippType=\"$type\" ippName=\"\" comment=\"$comment\"/>");
+
+#    $mapWriter->endTag();
 
     return $colNum;