Index: trunk/ippToPsps/perl/pspsSchema2xml.pl
===================================================================
--- trunk/ippToPsps/perl/pspsSchema2xml.pl	(revision 31759)
+++ trunk/ippToPsps/perl/pspsSchema2xml.pl	(revision 33758)
@@ -4,6 +4,6 @@
 #
 # Script that searches a dir containing PSPS schema files, finds those that comtain the 
-# tables on interest then parses them into an XML format. Also generates C-header files 
-# containing enums that detail table column names and numbers.
+# tables on interest then parses them into the VOTable format. Also generates trac-wiki 
+# formatted tables.
 #
 #######################################################################################
@@ -51,20 +51,4 @@
 
 my $enumsHeader = ucfirst($type)."BatchEnums";
-open(OUT, ">".$enumsHeader.".h") or die("Error");
-
-print OUT "#ifndef ".uc($enumsHeader)."_H\n";
-print OUT "#define ".uc($enumsHeader)."_H\n\n";
-
-# tables file
-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");
-
-# map file
-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");
 
 # VOTable file
@@ -82,18 +66,8 @@
 
 # finish up XML
-$tablesWriter->endTag();
-$tablesWriter->end();
-
-# finish up XML
-$mapWriter->endTag();
-$mapWriter->end();
-
-# finish up XML
 $votWriter->endTag(); # end RESOURCE tag
 $votWriter->endTag(); # end of TABLE tag
 $votWriter->end();
 
-print OUT "\n#endif";
-close OUT;
 close WIKI;
 
@@ -208,4 +182,5 @@
 
     parseTable("Object");
+    parseTable("ObjectCalColor");
 }
 
@@ -230,9 +205,4 @@
     print WIKI "|| '''!".$tableNameOut."''' ||||||||||||||\n";
     print WIKI "|| '''ODM attribute''' || '''units''' || '''Data type''' || '''Default''' || '''Description''' || '''IPP source''' || '''IPP variable/notes''' ||\n";
-    print OUT "\ntypedef enum {\n";
-    $tablesWriter->startTag('table', "name" => $tableNameOut);
-    $mapWriter->startTag('table', 
-            "name" => $tableNameOut,
-            "ippfitsextension" => "");
     $votWriter->startTag('TABLE', 
             "name" => "$tableNameOut");
@@ -287,6 +257,4 @@
 
     if (!$found) {print "Could not find table '$tableName'\n";}
-    $tablesWriter->endTag();
-    $mapWriter->endTag();
 
     $votWriter->startTag('DATA');
@@ -295,5 +263,4 @@
         $votWriter->endTag(); # end DATA tag
         $votWriter->endTag(); # end TABLE tag
-        print OUT "} ".$tableNameOut.";\n";
 
     close SCHEMA;
@@ -384,13 +351,5 @@
     $colNum++;
 
-    print OUT "  ".uc($tableName)."_".uc($name)." = ".$colNum.",\n";
     print WIKI "|| ".$name."||".$unit."||".$mstype."||".$default."||".$comment."|| || ||\n";
-
-    $tablesWriter->startTag('column',
-            "name" => $name,
-            "type" => $type,
-            "default" => $default,
-            "comment" => $fullComment);
-    $tablesWriter->endTag();
 
     # get VOTable type
@@ -413,8 +372,4 @@
     $votWriter->endTag();
 
-    $mapWriter->comment(" **MISSING** <map pspsName=\"$name\" ippType=\"$type\" ippName=\"\" comment=\"$fullComment\"/>");
-
-#    $mapWriter->endTag();
-
     return $colNum;
 }