Changeset 653 for trunk

Timestamp:

Jun 12, 2015, 1:12:32 PM (10 years ago)

Author:

djay

Message:

Small fixes for building on GNU/Linux.

Location:

trunk/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• ZOOMakefile.opts.in (modified) (1 diff)
• server_internal.c (modified) (3 diffs)
• service_internal.c (modified) (3 diffs)
• service_internal_saga.c (modified) (3 diffs)
• sqlapi.h (modified) (1 diff)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -107 +107 @@
         install -d ${CGI_DIR}
         install zoo_loader.cgi ${CGI_DIR}/
-        install libzoo_service.${EXT} ${DESTDIR}${INST_LIB}/libzoo_service.${VERSION}.${REVISION}.${EXT}
+        install libzoo_service.${EXT} ${DESTDIR}${INST_LIB}/${LIBZOO_SERVICE}
         (cd ${DESTDIR}${INST_LIB} ; \
          if [ -e "libzoo_service.${EXT}" ]; then rm  libzoo_service.${EXT}; fi ; \
-         ln -s libzoo_service.${VERSION}.${REVISION}.${EXT} libzoo_service.${EXT})
+         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
         install -d ${DESTDIR}${INST_INCLUDE}/zoo
         install service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -15 +15 @@
         EXT=dylib
         DEFAULT_OPTS=-Wl,-compatibility_version,${VERSION},-current_version,${VERSION},-install_name,${DESTDIR}${INST_LIB}/libzoo_service.${VERSION}.${REVISION}.dylib
+        LIBZOO_SERVICE=libzoo_service.${VERSION}.${REVISION}.${EXT}
+else
+        LIBZOO_SERVICE=libzoo_service.${EXT}.${VERSION}
 endif
 

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -31 +31 @@
 #include <uuid/uuid.h>
 
+/**
+ * Detect WPS version used (1.0.0 or 2.0.0).
+ *
+ * @param version number as char* (1.0.0 or 2.0.0)
+ * @return 0 in case of version 1.0.0, 1 for 2.0.0, -1 in other case
+ */
 int getVersionId(const char* version){
   int schemaId=0;
@@ -37 +43 @@
       return schemaId;
   }
-  return 0;
+  return -1;
 }
 
@@ -51 +57 @@
   uuid_t uuid;
   uuid_generate_time(uuid);
-  char * rest;
+  char rest[128];
   uuid_unparse(uuid,rest);
   sprintf(res,"%s", rest);

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -57 +57 @@
   FILE* f0 = fopen (fbkpid, "r");
   if(f0!=NULL){
+    long flen;
+    char *fcontent;
     fseek (f0, 0, SEEK_END);
-    long flen = ftell (f0);
+    flen = ftell (f0);
     fseek (f0, 0, SEEK_SET);
-    char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
-    fread(tmps1,flen,1,f0);
-    tmps1[flen]=0;
+    fcontent = (char *) malloc ((flen + 1) * sizeof (char));
+    fread(fcontent,flen,1,f0);
+    fcontent[flen]=0;
     fclose(f0);
-    return tmps1;
+    return fcontent;
   }else
     return NULL;
@@ -188 +190 @@
   FILE* f0 = fopen (fbkpid, "r");
   if(f0!=NULL){
-    char* stat=getStatusId(conf,lid);
+    semid lockid;
+    char* stat;
+    long flen;
+    stat=getStatusId(conf,lid);
     if(stat!=NULL){
       setMapInMaps(conf,"lenv","lid",stat);
-      semid lockid=acquireLock(conf);
+      lockid=acquireLock(conf);
       if(lockid<0)
         return NULL;
     }
     fseek (f0, 0, SEEK_END);
-    long flen = ftell (f0);
+    flen = ftell (f0);
     if(flen>0){
+      char *fcontent;
       fseek (f0, 0, SEEK_SET);
-      char *tmps1 = (char *) malloc ((flen + 1) * sizeof (char));
-      fread(tmps1,flen,1,f0);
-      tmps1[flen]=0;
+      fcontent = (char *) malloc ((flen + 1) * sizeof (char));
+      fread(fcontent,flen,1,f0);
+      fcontent[flen]=0;
       fclose(f0);
       free(fbkpid);
@@ -208 +214 @@
         free(stat);
       }
-      return tmps1;
+      return fcontent;
     }
     fclose(f0);

trunk/zoo-project/zoo-kernel/service_internal_saga.c

@@ -138 +138 @@
     case CALLBACK_DLG_CONTINUE:
     case CALLBACK_PROCESS_SET_READY:
+    case CALLBACK_PROCESS_GET_OKAY:
+      return res;
       break;
 
@@ -145 +147 @@
         if( cPercent != status ){
           status=cPercent;
-        }
-      }
-      break;
-
-    case CALLBACK_PROCESS_GET_OKAY:
-      status=1;
+        }else
+          return res;
+      }
       break;
 
@@ -178 +177 @@
       else
         res = 0;
+      return res;
       break;
 

trunk/zoo-project/zoo-kernel/sqlapi.h

@@ -38 +38 @@
   void recordStoredFile(maps*,const char*,const char*,const char*);
   void recordServiceStatus(maps*);
-  void recordResponse(maps*,char*,bool);
+  void recordResponse(maps*,char*);
 #endif