Changeset 638

Timestamp:

Apr 27, 2015, 3:28:16 PM (10 years ago)

Author:

djay

Message:

Fix for SAGA-GIS generated ZCFG and add '=' to the acceptable values in a ZCFG.

Location:

trunk

Files:

• thirds/saga2zcfg/saga2zcfg.c (modified) (5 diffs)
• zoo-project/zoo-kernel/service_conf.l (modified) (1 diff)

trunk/thirds/saga2zcfg/saga2zcfg.c

@@ -15 +15 @@
 }
 
-const char* cleanAbstract(CSG_String abstract){
+void cleanAbstract(CSG_String abstract,char**res){
   char* tmp=strdup(abstract.b_str());
-  CSG_String val=CSG_String(" ")+tmp;
-  if(val.Contains("¸")){
-    val.Replace("¸"," ");
+  CSG_String val=CSG_String("")+tmp;
+  if(val.Contains("\r")){
+    val.Replace("\r","<br/>");
   }
   if(val.Contains("\n")){
     val.Replace("\n","<br/>");
   }
-  if(val.Contains("\r")){
-    val.Replace("\r","");
-  }
   if(val.Contains("<")){
     val.Replace("<","&lt;");
@@ -32 +29 @@
   if(val.Contains(">")){
     val.Replace(">","&gt;");
-    fprintf(stderr,"%s\n",val.b_str());
   }
   free(tmp);
-  fprintf(stderr,"%s\n",val.b_str());
-  return val.b_str();
+  if(val.is_Empty())
+    *res=NULL;
+  else
+    *res=strdup(val.b_str());
 }
 
@@ -45 +43 @@
     fprintf(stdout,"  Abstract = %s\n",CSG_String(param->Get_Name()).b_str());
   else{
-    fprintf(stdout,"  Abstract = %s\n",cleanAbstract(CSG_String(param->Get_Description())));
+    char* tmp=strdup(CSG_String(param->Get_Description()).b_str());
+    CSG_String val=CSG_String("")+tmp;
+    if(val.Contains("\r")){
+      val.Replace("\r","<br/>");
+    }
+    if(val.Contains("\n")){
+      val.Replace("\n","<br/>");
+    }
+    if(val.Contains("<")){
+      val.Replace("<","&lt;");
+    }
+    if(val.Contains(">")){
+      val.Replace(">","&gt;");
+    }
+    free(tmp);
+    fprintf(stdout,"  Abstract = %s\n",val.b_str());
   }
   if(!out){
@@ -148 +161 @@
 
           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);
@@ -156 +169 @@
             fprintf(stdout1," Abstract = %s\n",module->Get_Name().b_str());
           else{
-            const char *tmp=cleanAbstract(module->Get_Description());
-            if(tmp==NULL || strlen(tmp)<7 ){
+            char *val0;
+            cleanAbstract(module->Get_Description(),&val0);
+            if(val0==NULL)
               fprintf(stdout1," Abstract = %s\n",module->Get_Name().b_str());
-            }
             else{
-              fprintf(stdout1," Abstract = %s\n",tmp);
+              fprintf(stdout1," Abstract = %s\n",val0);
+              free(val0);
             }
           }

trunk/zoo-project/zoo-kernel/service_conf.l

@@ -46 +46 @@
 
 attname [a-zA-Z0-9._\-]+
-attvalue1       [\x80-\xbf\xc2-\xdf\xe0-\xef\xf0-\xf4#°²θé\^\*\+\,\;?!~`ú@a-zA-Z0-9%_\-:\:.:" "\"\'/\\\(\)\t\|\$\&>\[\]]+
+attvalue1      [\x80-\xbf\xc2-\xdf\xe0-\xef\xf0-\xf4="#°²θé\^\*\+\,\;;?!~`ú@a-zA-Z0-9%_\-:\:.:" "\"\'/\\\(\)\t\|\$\&>\[\]]+
 
 attvalue                \"[^"]*\"|\'[^']*\'\(\)