[Cctbx-cvs] SF.net SVN: cctbx:[13518] trunk/spotfinder/servers

[<nks...@us...>]

Revision: 13518
          http://cctbx.svn.sourceforge.net/cctbx/?rev=13518&view=rev
Author:   nksauter
Date:     2011-07-18 02:05:13 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Spotfinder Apache server:  now independent of Labelit.

Modified Paths:
--------------
    trunk/spotfinder/servers/apache.py
    trunk/spotfinder/servers/apache_install.csh

Modified: trunk/spotfinder/servers/apache.py
===================================================================
--- trunk/spotfinder/servers/apache.py	2011-07-17 22:55:58 UTC (rev 13517)
+++ trunk/spotfinder/servers/apache.py	2011-07-18 02:05:13 UTC (rev 13518)
@@ -31,12 +31,11 @@
 def run(args, verbose=False):
   from libtbx.utils import Sorry
   import os
-  from labelit.preferences import labelit_phil
   from spotfinder.command_line.signal_strength import master_params
 
   #For the Apache server version, do not allow site, user, or dataset preferences
   #all parameters are to be passed in through the http: query line
-  labelit_phil.rollback_dataset_preferences()
+  #labelit_phil.rollback_dataset_preferences()
 
   logfile = LoggingFramework()
 

Modified: trunk/spotfinder/servers/apache_install.csh
===================================================================
--- trunk/spotfinder/servers/apache_install.csh	2011-07-17 22:55:58 UTC (rev 13517)
+++ trunk/spotfinder/servers/apache_install.csh	2011-07-18 02:05:13 UTC (rev 13518)
@@ -72,7 +72,7 @@
 echo Building CCI apps...consult install_cci.log
 cd ${BUILD_DIR}
 # LD_LIBRARY_PATH is required for this step:
-${USE_PYTHON}/bin/python ${SRC_DIR}/cctbx_project/libtbx/configure.py labelit >& ${SRC_DIR}/install_cci.log
+${USE_PYTHON}/bin/python ${SRC_DIR}/cctbx_project/libtbx/configure.py spotfinder >& ${SRC_DIR}/install_cci.log
 source setpaths.csh
 make >>& ${SRC_DIR}/install_cci.log
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.