1.1 --- a/blocks3d/wt/config.C	Sun Oct 31 18:04:29 2010 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,36 +0,0 @@
     1.4 -
     1.5 -#include "config.h"
     1.6 -#include <boost/format.hpp>
     1.7 -#include <string>
     1.8 -
     1.9 -
    1.10 -namespace Malakite
    1.11 -{
    1.12 -
    1.13 -const char* python_path = "python";
    1.14 -const char* blocks3d_path = "/home/boris/my-code/Blocks3D/Blocks3D_v5/Blocks3D.py";
    1.15 -const char* temp_path = "/tmp";
    1.16 -const char* temp_mkstemp_path = "/tmp/XXXXXX";
    1.17 -
    1.18 -const char* main_url = "/";
    1.19 -
    1.20 -//~ const char* tempfile_alignment = "in_aln.fasta";
    1.21 -//~ const char* tempfile_conformity = "in_conf.fasta";
    1.22 -//~ const char* tempfile_html = "out.html";
    1.23 -//~ const char* tempfile_check = "check.lock";
    1.24 -const char* tempfile_sh = "run.sh";
    1.25 -
    1.26 -namespace defaults
    1.27 -{
    1.28 -
    1.29 -const char* delta = "2.0";
    1.30 -const char* min_block_width = "3";
    1.31 -const char* timeout = "10";
    1.32 -const char* timeout2 = "10";
    1.33 -
    1.34 -}
    1.35 -
    1.36 -
    1.37 -
    1.38 -}
    1.39 -

     2.1 --- a/blocks3d/wt/config.h	Sun Oct 31 18:04:29 2010 +0300
     2.2 +++ b/blocks3d/wt/config.h	Tue Nov 02 17:28:44 2010 +0300
     2.3 @@ -3,36 +3,34 @@
     2.4  
     2.5  namespace Malakite
     2.6  {
     2.7 -
     2.8 +    
     2.9  const int refresh_period = 5*1000;
    2.10 -
    2.11  const unsigned int max_simultaneous_tasks = 100;
    2.12  
    2.13 -extern const char* python_path;
    2.14 -extern const char* blocks3d_path;
    2.15 -extern const char* temp_path;
    2.16 -extern const char* temp_mkstemp_path;
    2.17 +const char* const python_path = "python";
    2.18 +const char* const blocks3d_path = "/home/boris/my-code/Blocks3D/Blocks3D_v5/Blocks3D.py";
    2.19 +const char* const temp_path = "/tmp";
    2.20 +const char* const temp_mkstemp_path = "/tmp/XXXXXX";
    2.21  
    2.22 -const char* const test = "123";
    2.23 +const char* const main_url = "/";
    2.24  
    2.25 -extern const char* main_url;
    2.26 -
    2.27 -//~ extern const char* tempfile_alignment;
    2.28 -//~ extern const char* tempfile_conformity;
    2.29 -//~ extern const char* tempfile_html;
    2.30 -//~ extern const char* tempfile_check;
    2.31 -extern const char* tempfile_sh;
    2.32 +const char* const tempfile_sh = "run.sh";
    2.33  
    2.34  namespace defaults
    2.35  {
    2.36  
    2.37 -extern const char* delta;
    2.38 -extern const char* min_block_width;
    2.39 -extern const char* timeout;
    2.40 -extern const char* timeout2;
    2.41 +const char* const delta = "2.0";
    2.42 +const char* const min_block_width = "3";
    2.43 +const char* const timeout = "10";
    2.44 +const char* const timeout2 = "10";
    2.45  
    2.46  }
    2.47  
    2.48 +
    2.49 +
    2.50  }
    2.51  
    2.52 +
    2.53 +
    2.54 +
    2.55  #endif // MALAKITE_BLOCKS3D_CONFIG_H_s