Changeset 38823

Timestamp:

Oct 8, 2015, 2:07:30 PM (11 years ago)

Author:

eugene

Message:

removing duplicate jython.jar; only copy in jython2.5.3b1 is kept

Location:

trunk/ippToPsps

Files:

• config/ippToPspsDbSchema.sql (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• jars/jython.jar (deleted)
• jython/ippjython (modified) (1 diff)
• jython/scratchdb.py (modified) (1 diff)
• perl/Makefile.am (modified) (1 diff)
• test/fulltest.sh (modified) (2 diffs)
• test/mkgpc1data.dvo (modified) (1 diff)

trunk/ippToPsps/config/ippToPspsDbSchema.sql

@@ -223 +223 @@
 -- i had to do this to get uniqueness prob sorted out:
 
---show index from pending;
---alter table pending drop index `name`;
---where name was broken becaue it only indedxed stage idg
+-- show index from pending;
+-- alter table pending drop index `name`;
+-- where name was broken becaue it only indedxed stage idg
 
 DROP TABLE IF EXISTS `pending`;

trunk/ippToPsps/configure.ac

@@ -9 +9 @@
 AM_MAINTAINER_MODE
 
-IPP_STDLDFLAGS
+dnl IPP_STDLDFLAGS
 
 AC_LANG(C)
@@ -20 +20 @@
 dnl ------------------------------------------------------------
 
-AC_PATH_PROG([ERRORCODES], [psParseErrorCodes], [missing])
-if test "$ERRORCODES" = "missing" ; then
-  AC_MSG_ERROR([psParseErrorCodes is required])
-fi
+dnl AC_PATH_PROG([ERRORCODES], [psParseErrorCodes], [missing])
+dnl if test "$ERRORCODES" = "missing" ; then
+dnl   AC_MSG_ERROR([psParseErrorCodes is required])
+dnl fi
 
 dnl ------------- psLib, psModules ---------------
-PKG_CHECK_MODULES([PSLIB],    [pslib >= 1.0.0])
-PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
+dnl PKG_CHECK_MODULES([PSLIB],    [pslib >= 1.0.0])
+dnl PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
 
 dnl Set CFLAGS for build
-IPP_STDOPTS
-IPP_STDCFLAGS
+dnl IPP_STDOPTS
+dnl IPP_STDCFLAGS
+
 dnl CFLAGS="${CFLAGS=} -Wall -Werror"
-echo "IPPTOPSPS_CFLAGS: $IPPTOPSPS_CFLAGS"
-echo "IPPTOPSPS_LIBS: $IPPTOPSPS_LIBS"
+dnl echo "IPPTOPSPS_CFLAGS: $IPPTOPSPS_CFLAGS"
+dnl echo "IPPTOPSPS_LIBS: $IPPTOPSPS_LIBS"
+dnl 
+dnl OHANA_CFLAGS="`ohana-config --cflags`"
+dnl OHANA_LIBS="`ohana-config --libs` -lX11"
 
-OHANA_CFLAGS="`ohana-config --cflags`"
-OHANA_LIBS="`ohana-config --libs` -lX11"
-
-IPP_VERSION
-
-AC_SUBST([IPPTOPSPS_CFLAGS])
-AC_SUBST([IPPTOPSPS_LIBS])
+dnl IPP_VERSION
+dnl 
+dnl AC_SUBST([IPPTOPSPS_CFLAGS])
+dnl AC_SUBST([IPPTOPSPS_LIBS])
 
 AC_CONFIG_FILES([
@@ -50 +51 @@
   jython/Makefile
   perl/Makefile
-  src/Makefile
   Doxyfile
 ])
 
+dnl src/Makefile
+
 AC_OUTPUT

trunk/ippToPsps/jython/ippjython

@@ -20 +20 @@
 setenv IPPTOPSPS_DATA $datadir/ipptopsps
 
-# XXX install jython in JARDIR
-set JYTHON = $JARDIR/jython2.5.3b1/jython.jar
-# set JYTHON = ~/jython2.5.3b1/jython.jar
-#set JYTHON = $JARDIR/jython.jar
+# both jython.jar and Lib from jython2.5.3b1 must be installed in JARDIR
+set JYTHON = $JARDIR/jython.jar
 
 if (! -r $JYTHON) then
   echo "jython jar file not found, check jython installation"
   echo $JYTHON  
+  echo "*** ask gene for help! ***"
+  echo " here is the jardir:"
+  ls -l $JARDIR
   exit 2
 endif

trunk/ippToPsps/jython/scratchdb.py

@@ -495 +495 @@
         # now detection table
         self.logger.infoPair("Dropping DVO table", dvoDetectionTable)
-        sql = "DROP TABLE " + dvoDetectionTable
+        sql = "DROP TABLE " + dvoDetectionTable + " IF EXISTS"
         try: self.execute(sql)
         except: 

trunk/ippToPsps/perl/Makefile.am

@@ -1 @@
-bin_SCRIPTS = checkOdmStatus.pl convertPhotCodesToXml.pl deleteFromDXLayer.pl pspsSchema2xml.pl deleteFromDXLayer2.pl
+bin_SCRIPTS = \
+  checkOdmStatus.pl \
+  convertPhotCodesToXml.pl \
+  deleteFromDXLayer.pl \
+  pspsSchema2xml.pl \
+  deleteFromDXLayer2.pl
 
 INSTALL = @INSTALL@ -C

trunk/ippToPsps/test/fulltest.sh

@@ -156 +156 @@
   # does the database already exist?
   # XXX this command will blow away an existing database!!
-  mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test"
-  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql
+  mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3
+  mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 2
 endif
 
@@ -166 +166 @@
 
   # create the database (ignore failure if it already exists)
-  mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch"
+  mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch"
   mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch"
   ippjython setupScratchDb.py -test < /dev/null

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -147 +147 @@
 
     mkinput $offset $rawfile
+    echo mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0
     exec mkcmf -photcode SIMTEST.r.Chip -no-noise -append $rawfile $cmffile -date $myDATE -time $myTIME -radec $RA $DEC -type $1 -imageID $ID -sourceID 0