Changeset 31146 for branches/eam_branches/ipp-20110213/ippToPsps

Timestamp:

Apr 4, 2011, 11:09:34 AM (15 years ago)

Author:

eugene

Message:

merging from trunk

Location:

branches/eam_branches/ipp-20110213/ippToPsps

Files:

• config/detection/tables.vot (copied) (copied from trunk/ippToPsps/config/detection/tables.vot )
• config/stack/tables.vot (copied) (copied from trunk/ippToPsps/config/stack/tables.vot )
• jython (copied) (copied from trunk/ippToPsps/jython )
• jython/batch.py (copied) (copied from trunk/ippToPsps/jython/batch.py )
• jython/demo.fits (copied) (copied from trunk/ippToPsps/jython/demo.fits )
• jython/detectionbatch.py (copied) (copied from trunk/ippToPsps/jython/detectionbatch.py )
• jython/initbatch.py (copied) (copied from trunk/ippToPsps/jython/initbatch.py )
• jython/run.sh (copied) (copied from trunk/ippToPsps/jython/run.sh )
• jython/stackbatch.py (copied) (copied from trunk/ippToPsps/jython/stackbatch.py )
• jython/stilts.py (copied) (copied from trunk/ippToPsps/jython/stilts.py )
• perl/pspsSchema2xml.pl (modified) (6 diffs)

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

@@ -54 +54 @@
 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);
@@ -60 +60 @@
 $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
+my $votOutput = new IO::File(">tables.vot");
+my $votWriter = new XML::Writer(OUTPUT => $votOutput, DATA_MODE => 1, DATA_INDENT=>2);
+$votWriter->xmlDecl('UTF-8');
+$votWriter->startTag('VOTABLE', "version" => "1.1");
+$votWriter->startTag('RESOURCE');
 
 if ($type eq "init") {createInit();}
@@ -78 +86 @@
 $mapWriter->endTag();
 $mapWriter->end();
+
+# finish up XML
+$votWriter->endTag(); # end RESOURCE tag
+$votWriter->endTag(); # end of TABLE tag
+$votWriter->end();
 
 print OUT "\n#endif";
@@ -214 +227 @@
             "name" => $tableNameOut,
             "ippfitsextension" => "");
+    $votWriter->startTag('TABLE', 
+            "name" => "$tableNameOut");
+    $votWriter->dataElement('DESCRIPTION', "VOTable description of PSPS table $tableNameOut");
+    $votWriter->startTag('PARAM',
+            "arraysize" => "1",
+            "datatype" => "char",
+            "ucd" => "meta.bib.author",
+            "name" => "Author",
+            "value" => "PSPS");
+    $votWriter->endTag();
 
     open (SCHEMA, $path);
@@ -258 +281 @@
     $tablesWriter->endTag();
     $mapWriter->endTag();
-    print OUT "} ".$tableNameOut.";\n";
+
+    $votWriter->startTag('DATA');
+    $votWriter->startTag('TABLEDATA');
+    $votWriter->endTag(); # end TABLEDDATA tag
+        $votWriter->endTag(); # end DATA tag
+        $votWriter->endTag(); # end TABLE tag
+        print OUT "} ".$tableNameOut.";\n";
 
     close SCHEMA;
@@ -350 +379 @@
     $tablesWriter->endTag();
 
+    # get VOTable type
+    my $votType = "undef";
+    my $arraySize = 1;
+    if ($type eq "TBYTE") {$votType = "unsignedByte";}
+    elsif ($type eq "TSHORT") {$votType = "short";}
+    elsif ($type eq "TLONG") {$votType = "int";}
+    elsif ($type eq "TLONGLONG") {$votType = "long";}
+    elsif ($type eq "TFLOAT") {$votType = "float";}
+    elsif ($type eq "TDOUBLE") {$votType = "double";}
+    elsif ($type eq "TSTRING") {$votType = "char"; $arraySize = 100;}
+
+    $votWriter->startTag('FIELD',
+            "name" => $name,
+            "arraysize" => $arraySize,
+            "datatype" => $votType);
+    $votWriter->endTag();
+
     $mapWriter->comment(" **MISSING** <map pspsName=\"$name\" ippType=\"$type\" ippName=\"\" comment=\"$comment\"/>");