Changeset 741 for branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Oct 7, 2015, 8:41:43 AM (9 years ago)

Author:

david

Message:

 

File:

• branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/server_internal.c (modified) (8 diffs)

branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/server_internal.c

@@ -850 +850 @@
  * @param req the request (GetStatus / GetResult)
  */
-void runGetStatus(maps* conf,char* pid,char* req){
+void runGetStatus(maps* conf,char* pid,char* req,FCGX_Stream* out){
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
   char *sid=getStatusId(conf,pid);
   if(sid==NULL){
     errorException (conf, _("The JobID from the request does not match any of the Jobs running on this server"),
-                    "NoSuchJob", pid);
+                    "NoSuchJob", pid,out);
   }else{
     map* statusInfo=createMap("JobID",pid);
@@ -861 +861 @@
       if(strncasecmp(req,"GetResult",strlen(req))==0){
         errorException (conf, _("The result for the requested JobID has not yet been generated. "),
-                        "ResultNotReady", pid);
+                        "ResultNotReady", pid,out);
         return;
       }
@@ -885 +885 @@
         if(result!=NULL){
           char *encoding=getEncoding(conf);
-          fprintf(stdout,"Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
-          fprintf(stdout,"%s",result);
-          fflush(stdout);
+      FCGX_FPrintF(out,"Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+      FCGX_FPrintF(out,"%s",result);
+      FCGX_FFlush(out);
           freeMap(&statusInfo);
           free(statusInfo);
@@ -893 +893 @@
         }else{
           errorException (conf, _("The result for the requested JobID has not yet been generated. "),
-                          "ResultNotReady", pid);
+                          "ResultNotReady", pid,out);
           freeMap(&statusInfo);
           free(statusInfo);
@@ -914 +914 @@
         }
     }
-    printStatusInfo(conf,statusInfo,req);
+    printStatusInfo(conf,statusInfo,req,out);
     freeMap(&statusInfo);
     free(statusInfo);
@@ -927 +927 @@
  * @param pid the service identifier (usid key from the [lenv] section)
  */
-void runDismiss(maps* conf,char* pid){
+void runDismiss(maps* conf,char* pid,FCGX_Stream* out){
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
   char *sid=getStatusId(conf,pid);
   if(sid==NULL){
     errorException (conf, _("The JobID from the request does not match any of the Jobs running on this server"),
-                    "NoSuchJob", pid);
+                    "NoSuchJob", pid,out);
   }else{
     // We should send the Dismiss request to the target host if it differs
@@ -967 +967 @@
           if(unlink(fileName)!=0){
             errorException (conf, _("The job cannot be removed, a file cannot be removed"),
-                            "NoApplicableCode", NULL);
+                            "NoApplicableCode", NULL,out);
             return;
           }
@@ -978 +978 @@
     map* statusInfo=createMap("JobID",pid);
     addToMap(statusInfo,"Status","Dismissed");
-    printStatusInfo(conf,statusInfo,"Dismiss");
+    printStatusInfo(conf,statusInfo,"Dismiss",out);
     free(statusInfo);
   }