IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31146


Ignore:
Timestamp:
Apr 4, 2011, 11:09:34 AM (15 years ago)
Author:
eugene
Message:

merging from trunk

Location:
branches/eam_branches/ipp-20110213
Files:
13 edited
38 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110213/ippMonitor/def/autocodeImage.php

    r28614 r31146  
    136136      $filter = 0;
    137137      break;
     138    case 'g':
     139      $filter = 1;
     140      break;
     141    case 'r':
     142      $filter = 2;
     143      break;
     144    case 'i':
     145      $filter = 3;
     146      break;
     147    case 'z':
     148      $filter = 4;
     149      break;
     150    case 'y':
     151      $filter = 5;
     152      break;
     153    case 'w':
     154      $filter = 6;
     155      break;
    138156    default:
    139157      $filter = $value;

  • branches/eam_branches/ipp-20110213/ippMonitor/raw/czartool_labels.php

    r31083 r31146  
    191191      showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS);
    192192      showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP);
     193      showReplicationsStatus($REPL_HOST_IPPADMIN, $REPL_USER_IPPADMIN, $REPL_PASSWORD_IPPADMIN, $REPL_DBNAME_IPPADMIN);
    193194      echo "</table>";
    194195

  • branches/eam_branches/ipp-20110213/ippMonitor/raw/simplePlot.php

    r27194 r31146  
    258258    $filter = 6;
    259259    break;
     260   case 'g':
     261    $filter = 1;
     262    break;
     263   case 'r':
     264    $filter = 2;
     265    break;
     266   case 'i':
     267    $filter = 3;
     268    break;
     269   case 'z':
     270    $filter = 4;
     271    break;
     272   case 'y':
     273    $filter = 5;
     274    break;
     275   case 'w':
     276    $filter = 6;
     277    break;
    260278   default:
    261279    $filter = 0;

  • branches/eam_branches/ipp-20110213/ippMonitor/raw/simplePlotcam.php

    r27194 r31146  
    258258    $filter = 6;
    259259    break;
     260   case 'g':
     261    $filter = 1;
     262    break;
     263   case 'r':
     264    $filter = 2;
     265    break;
     266   case 'i':
     267    $filter = 3;
     268    break;
     269   case 'z':
     270    $filter = 4;
     271    break;
     272   case 'y':
     273    $filter = 5;
     274    break;
     275   case 'w':
     276    $filter = 6;
     277    break;   
    260278   default:
    261279    $filter = 0;

  • branches/eam_branches/ipp-20110213/ippMonitor/raw/simplePlotraw.php

    r27194 r31146  
    238238    $filter = 6;
    239239    break;
     240   case 'g':
     241    $filter = 1;
     242    break;
     243   case 'r':
     244    $filter = 2;
     245    break;
     246   case 'i':
     247    $filter = 3;
     248    break;
     249   case 'z':
     250    $filter = 4;
     251    break;
     252   case 'y':
     253    $filter = 5;
     254    break;
     255   case 'w':
     256    $filter = 6;
     257    break;
    240258   default:
    241259    $filter = 0;

  • branches/eam_branches/ipp-20110213/ippMonitor/raw/site.php.in

    r31083 r31146  
    2222$DELETION_DELAY = 15;
    2323
    24 $REPL_HOST_GPC1 = "ipp0012.IfA.Hawaii.Edu";
    25 $REPL_USER_GPC1 = "ipp";
    26 $REPL_PASSWORD_GPC1 = "ipp";
    27 $REPL_DBNAME_GPC1 = "ippadmin";
     24$REPL_HOST_IPPADMIN = "ipp0012.IfA.Hawaii.Edu";
     25$REPL_USER_IPPADMIN = "ipp";
     26$REPL_PASSWORD_IPPADMIN = "ipp";
     27$REPL_DBNAME_IPPADMIN = "ippadmin";
    2828
    2929$REPL_HOST_NEBULOUS = "ippdb02.IfA.Hawaii.Edu";
    … …  
    3737$REPL_DBNAME_PSTAMP = "ippRequestServer";
    3838
     39$REPL_HOST_GPC1 = "ippc02.IfA.Hawaii.Edu";
     40$REPL_USER_GPC1 = "ippMonitor";
     41$REPL_PASSWORD_GPC1 = "ippMonitor";
     42$REPL_DBNAME_GPC1 = "gpc1";
     43
    3944?>

  • branches/eam_branches/ipp-20110213/ippScripts/scripts/ipp_apply_burntool_single.pl

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20110213/ippScripts/scripts/summit_copy.pl

    r31083 r31146  
    253253        if ($exit_code == 110) {
    254254            $command = "$pztool -updatepzexp";
     255            $command .= " -summit_id $summit_id";
    255256            $command .= " -exp_name $exp_name";
    256             $command .= " -camera $inst";
     257            $command .= " -inst $inst";
    257258            $command .= " -telescope $telescope";
    258259            $command .= " -set_state drop";

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

    r30186 r31146  
    5454print OUT "#define ".uc($enumsHeader)."_H\n\n";
    5555
    56 
     56# tables file
    5757my $tablesOutput = new IO::File(">tables.xml");
    5858my $tablesWriter = new XML::Writer(OUTPUT => $tablesOutput, DATA_MODE => 1, DATA_INDENT=>2);
    … …  
    6060$tablesWriter->startTag('tableDescriptions', "type" => "$type");
    6161
     62# map file
    6263my $mapOutput = new IO::File(">map.xml");
    6364my $mapWriter = new XML::Writer(OUTPUT => $mapOutput, DATA_MODE => 1, DATA_INDENT=>2);
    6465$mapWriter->xmlDecl('UTF-8');
    6566$mapWriter->startTag('tabledata', "type" => "$type");
     67
     68# VOTable file
     69my $votOutput = new IO::File(">tables.vot");
     70my $votWriter = new XML::Writer(OUTPUT => $votOutput, DATA_MODE => 1, DATA_INDENT=>2);
     71$votWriter->xmlDecl('UTF-8');
     72$votWriter->startTag('VOTABLE', "version" => "1.1");
     73$votWriter->startTag('RESOURCE');
    6674
    6775if ($type eq "init") {createInit();}
    … …  
    7886$mapWriter->endTag();
    7987$mapWriter->end();
     88
     89# finish up XML
     90$votWriter->endTag(); # end RESOURCE tag
     91$votWriter->endTag(); # end of TABLE tag
     92$votWriter->end();
    8093
    8194print OUT "\n#endif";
    … …  
    214227            "name" => $tableNameOut,
    215228            "ippfitsextension" => "");
     229    $votWriter->startTag('TABLE',
     230            "name" => "$tableNameOut");
     231    $votWriter->dataElement('DESCRIPTION', "VOTable description of PSPS table $tableNameOut");
     232    $votWriter->startTag('PARAM',
     233            "arraysize" => "1",
     234            "datatype" => "char",
     235            "ucd" => "meta.bib.author",
     236            "name" => "Author",
     237            "value" => "PSPS");
     238    $votWriter->endTag();
    216239
    217240    open (SCHEMA, $path);
    … …  
    258281    $tablesWriter->endTag();
    259282    $mapWriter->endTag();
    260     print OUT "} ".$tableNameOut.";\n";
     283
     284    $votWriter->startTag('DATA');
     285    $votWriter->startTag('TABLEDATA');
     286    $votWriter->endTag(); # end TABLEDDATA tag
     287        $votWriter->endTag(); # end DATA tag
     288        $votWriter->endTag(); # end TABLE tag
     289        print OUT "} ".$tableNameOut.";\n";
    261290
    262291    close SCHEMA;
    … …  
    350379    $tablesWriter->endTag();
    351380
     381    # get VOTable type
     382    my $votType = "undef";
     383    my $arraySize = 1;
     384    if ($type eq "TBYTE") {$votType = "unsignedByte";}
     385    elsif ($type eq "TSHORT") {$votType = "short";}
     386    elsif ($type eq "TLONG") {$votType = "int";}
     387    elsif ($type eq "TLONGLONG") {$votType = "long";}
     388    elsif ($type eq "TFLOAT") {$votType = "float";}
     389    elsif ($type eq "TDOUBLE") {$votType = "double";}
     390    elsif ($type eq "TSTRING") {$votType = "char"; $arraySize = 100;}
     391
     392    $votWriter->startTag('FIELD',
     393            "name" => $name,
     394            "arraysize" => $arraySize,
     395            "datatype" => $votType);
     396    $votWriter->endTag();
     397
    352398    $mapWriter->comment(" **MISSING** <map pspsName=\"$name\" ippType=\"$type\" ippName=\"\" comment=\"$comment\"/>");
    353399

  • branches/eam_branches/ipp-20110213/ippTools/share/camtool_find_pendingimfile.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20110213/ippTools/share/pxadmin_create_tables.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20110213/ippTools/src

  • branches/eam_branches/ipp-20110213/ippTools/src/magictool.c

    r31083 r31146  
    873873        return false;
    874874    }
    875     psFree(whereString);
    876875    psFree(query);
    877876
    … …  
    915914            }
    916915
    917             whereString = NULL;
    918             psStringAppend(&whereString, "\nAND (magic_id = %" PRId64 ")", magic_id);
    919             if (!p_psDBRunQueryF(config->dbh, query, whereString )) {
     916            psString whereString2 = NULL;
     917            psStringAppend(&whereString2, "\nAND (magic_id = %" PRId64 ")", magic_id);
     918            if (!p_psDBRunQueryF(config->dbh, query, whereString2 )) {
    920919                psError(PS_ERR_UNKNOWN, false, "database error");
    921                 psFree(whereString);
     920                psFree(whereString2);
    922921                psFree(query);
    923922                return false;
    924923            }
    925             psFree(whereString);
     924            psFree(whereString2);
    926925            psArray *magicTree = p_psDBFetchResult(config->dbh);
    927926            if (!magicTree) {
    … …  
    10221021        return false;
    10231022    }
     1023    psFree(whereString);
    10241024    psFree(query);
    10251025
Note: See TracChangeset for help on using the changeset viewer.