Changeset 384 for trunk/zoo-project/zoo-services/utils

Timestamp:

Jan 9, 2013, 11:52:44 PM (12 years ago)

Author:

djay

Message:

Fix asynchronous support on windows platform, fix storage of responseDocument and add a sample service in Python language using the ZOO-API. Update makefile.vc and nmake.opt to remove unneeded cgic linkage. Fix for headers section to display only if needed.

Location:

trunk/zoo-project/zoo-services/utils/status

Files:

• cgi-env/demo.zcfg (added)
• cgi-env/service.py (added)
• makefile.vc (modified) (1 diff)
• service.c (modified) (4 diffs)

trunk/zoo-project/zoo-services/utils/status/makefile.vc

@@ -1 @@
-ZOODIR=../../../zoo-kernel
-THIRDSDIR=../../../thirds
-!INCLUDE $(ZOODIR)/nmake.opt
-CFLAGS=-DWIN32 -I$(THIRDSDIR)/dirent-win32 -I$(GEODIR)/include -I$(TPATH)/include -I$(ZOODIR)/ -I./ -DLINUX_FREE_ISSUE -DDEBUG
-CPP=cl /TP 
+TROOT= $(ZOOK_DIR)
+!INCLUDE $(ZOOK_DIR)/nmake.opt
+
+FILES=$(ZOOK_DIR)/dirent.obj $(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
+!IFDEF JS_DIR
+FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
+!ENDIF
+!IFDEF JDK_DIR
+FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
+!ENDIF
+!IFDEF PY_DIR
+FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
+!ENDIF
+!IFDEF MS_DIR
+FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
+!ENDIF
 
 cgi-env/wps_status.zo: service.c
-        $(CPP) $(CFLAGS) /c service.c
-        link /dll /out:cgi-env/wps_status.zo $(ZOODIR)/service_internal.obj $(ZOODIR)/dirent.obj ./service.obj -L$(TPATH)/lib/libssl32.dll.a $(TPATH)/lib/libxslt.lib $(TPATH)/lib/libxml2.lib $(TPATH)/lib/libeay32.dll.a $(TPATH)/lib/libcrypto.a $(TOOLS)/lib/libssl32.dll.a $(LIBINTL_CPATH)/lib/libintl.lib
+        $(CPP) /D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DZOO_SERVICE $(CFLAGS) /c service.c
+        link /dll /out:cgi-env/wps_status.zo $(FILES) ./service.obj $(LDFLAGS) $(XSLT_DIR)\win32\bin.msvc\libxslt.lib /FORCE:MULTIPLE
 
 clean:
-        del /f cgi-env\wps*
+        erase cgi-env\*_status.*
+        erase *.obj

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -24 +24 @@
 
 #include "service.h"
-#ifdef WIN32
-#include <windows.h>
-#endif
+#include "service_internal.h"
 
 extern "C" {
@@ -40 +38 @@
 
 #include <dirent.h>
-#include "service_internal.h"
 
   /**
@@ -76 +73 @@
         fprintf(stderr,"File : %s searched : %s\n",dp->d_name,tmp);
 #endif
-        if(strstr(dp->d_name,tmp)!=0){
+        if(strstr(dp->d_name,"final_")==0 && strstr(dp->d_name,tmp)!=0){
           sprintf(fileName,"%s/%s",tmpTmap->value,dp->d_name);
           hasFile=1;
+          break;
         }
       }
@@ -109 +107 @@
       xmlDocDumpFormatMemory(res, &xmlbuff, &buffersize, 1);
       setMapInMaps(outputs,"Result","value",(char*)xmlbuff);
-      setMapInMaps(outputs,"Result","mimeType","text/xml");
-      setMapInMaps(outputs,"Result","encoding","UTF-8");
       xmlFree(xmlbuff);
     }