Changeset 637 for trunk/thirds

Timestamp:

Apr 24, 2015, 11:47:50 PM (10 years ago)

Author:

djay

Message:

Fixes in zcfg generator and fixes to build correctly on GNU/Linux.

File:

• trunk/thirds/saga2zcfg/saga2zcfg.c (modified) (6 diffs)

trunk/thirds/saga2zcfg/saga2zcfg.c

@@ -17 +17 @@
 const char* cleanAbstract(CSG_String abstract){
   char* tmp=strdup(abstract.b_str());
-  CSG_String val=CSG_String("")+tmp;
+  CSG_String val=CSG_String(" ")+tmp;
   if(val.Contains("¸")){
     val.Replace("¸"," ");
@@ -23 +23 @@
   if(val.Contains("\n")){
     val.Replace("\n","<br/>");
+  }
+  if(val.Contains("\r")){
+    val.Replace("\r","");
   }
   if(val.Contains("<")){
@@ -42 +45 @@
     fprintf(stdout,"  Abstract = %s\n",CSG_String(param->Get_Name()).b_str());
   else{
-    fprintf(stdout,"  Abstract = %s\n",cleanAbstract(CSG_String(param->Get_Description()).BeforeFirst('\n')));
+    fprintf(stdout,"  Abstract = %s\n",cleanAbstract(CSG_String(param->Get_Description())));
   }
   if(!out){
@@ -145 +148 @@
 
           mkdir(library->Get_Library_Name().b_str(),0755);
+          fprintf(stderr,"%s %s \n",library->Get_Library_Name().b_str(),CSG_String(module->Get_ID()).b_str());
           FILE *stdout1=fopen((library->Get_Library_Name()+"/"+module->Get_ID()+".zcfg").b_str(),"w+");
           fprintf(stdout1,"[%d]\n",j);
           fprintf(stdout1," Title = %s\n",module->Get_Name().b_str());
-          if(CSG_String(module->Get_Description()).is_Empty())
+          if(CSG_String(module->Get_Description()).is_Empty() ||
+             module->Get_Description().Length()<module->Get_Name().Length() )
             fprintf(stdout1," Abstract = %s\n",module->Get_Name().b_str());
-          else
-            fprintf(stdout1," Abstract = %s\n",cleanAbstract(module->Get_Description()));
+          else{
+            const char *tmp=cleanAbstract(module->Get_Description());
+            if(tmp==NULL || strlen(tmp)<7 ){
+              fprintf(stdout1," Abstract = %s\n",module->Get_Name().b_str());
+            }
+            else{
+              fprintf(stdout1," Abstract = %s\n",tmp);
+            }
+          }
           fprintf(stdout1," storeSupported = true\n");
           fprintf(stdout1," statusSupported = true\n");
@@ -294 +306 @@
                     for(int l=0;l<clen;l++){
                       //fprintf(stdout1,"%d",l);
-                      fprintf(stdout1,"%s",cleanAbstract(CSG_String(choice->Get_Item(l))));
+                      fprintf(stdout1,"%s",(CSG_String(choice->Get_Item(l))).b_str());
                       if(l+1<clen)
                         fprintf(stdout1,",");
@@ -302 +314 @@
                   fprintf(stdout1,"   <Default>\n");
                   if( !param->Get_Data()->Get_Default().is_Empty() ){
-                    fprintf(stdout1,"    value = %s\n",cleanAbstract(CSG_String(choice->Get_Item(atoi(param->Get_Data()->Get_Default())))));
+                    fprintf(stdout1,"    value = %s\n",CSG_String(choice->Get_Item(atoi(param->Get_Data()->Get_Default()))).b_str());
                   }
                   fprintf(stdout1,"   </Default>\n");