/[ascend]/trunk/base/generic/solver/conopt.c
ViewVC logotype

Diff of /trunk/base/generic/solver/conopt.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 894 by johnpye, Sun Sep 10 06:18:24 2006 UTC revision 895 by johnpye, Tue Oct 24 00:12:34 2006 UTC
# Line 110  int asc_conopt_load(){ Line 110  int asc_conopt_load(){
110    
111      /* need to import this variable into the ascend 'environment' */      /* need to import this variable into the ascend 'environment' */
112      if(-1!=env_import(ASC_CONOPT_ENVVAR,getenv,Asc_PutEnv)){      if(-1!=env_import(ASC_CONOPT_ENVVAR,getenv,Asc_PutEnv)){
113          CONSOLE_DEBUG("Using searchpath env var %s = %s",envvar,getenv(envvar));          CONSOLE_DEBUG("Searching in path '%s' (from env var '%s')",getenv(envvar),envvar);
114      }else{      }/*else{
115          CONSOLE_DEBUG("Using default conopt search path: %s", ASC_CONOPT_DLPATH);          CONSOLE_DEBUG("Default conopt search path: %s", ASC_CONOPT_DLPATH);
116      }      }*/
117    
118      libpath = SearchArchiveLibraryPath(libname, ASC_CONOPT_DLPATH, envvar);      libpath = SearchArchiveLibraryPath(libname, ASC_CONOPT_DLPATH, envvar);
119    
120      if(libpath==NULL){      if(libpath==NULL){
121          ERROR_REPORTER_NOLINE(ASC_PROG_ERR          ERROR_REPORTER_NOLINE(ASC_PROG_ERR
122              , "Library '%s' could not be located (check env var %s)"              , "Library '%s' could not be located (check value of env var '%s' and/or default path '%s')"
123              , libname, envvar              , libname, envvar, ASC_CONOPT_DLPATH
124          );          );
125          return 1;          return 1;
126      }      }

Legend:
Removed from v.894  
changed lines
  Added in v.895

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22