Changeset 605 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c
- Timestamp:
- Mar 9, 2015, 4:46:24 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/zoo_service_loader.c
r601 r605 195 195 char emsg[1024]; 196 196 sprintf (emsg, 197 _(" You set maximum occurences for <%s> as %i but you tried to use it more than the limit you set. Please correct your ZCFG file or your request."),197 _("The maximum allowed occurrences for <%s> (%i) was exceeded."), 198 198 mi->name, atoi (testMap->value)); 199 199 errorException (m, emsg, "InternalError", NULL); … … 227 227 sprintf (emsg, 228 228 _ 229 (" You set maximum occurences for <%s> to one but you tried to use it more than once. Please correct your ZCFG file or your request."),229 ("The maximum allowed occurrences for <%s> is one."), 230 230 mi->name); 231 231 errorException (m, emsg, "InternalError", NULL); … … 371 371 { 372 372 #ifdef DEBUG 373 fprintf (stderr, "Signal %d after the ZOO-Kernel returned result 373 fprintf (stderr, "Signal %d after the ZOO-Kernel returned result!\n", sig); 374 374 #endif 375 375 exit (0); … … 407 407 sprintf (tmp, 408 408 _ 409 ("ZOO Kernel failed to process your request receiving signal %d = %s"),409 ("ZOO Kernel failed to process your request, receiving signal %d = %s"), 410 410 sig, ssig); 411 411 errorException (NULL, tmp, "InternalError", NULL); … … 439 439 fflush (stderr); 440 440 #endif 441 442 map* libp = getMapFromMaps(m, "main", "libPath"); 443 441 444 if (strlen (r_inputs->value) == 1 442 445 && strncasecmp (r_inputs->value, "C", 1) == 0) 443 { 444 r_inputs = getMap (request_inputs, "metapath"); 445 if (r_inputs != NULL) 446 sprintf (tmps1, "%s/%s", ntmp, r_inputs->value); 447 else 448 sprintf (tmps1, "%s/", ntmp); 449 char *altPath = zStrdup (tmps1); 450 r_inputs = getMap (s1->content, "ServiceProvider"); 451 sprintf (tmps1, "%s/%s", altPath, r_inputs->value); 452 free (altPath); 446 { 447 if (libp != NULL && libp->value != NULL) { 448 r_inputs = getMap (s1->content, "ServiceProvider"); 449 sprintf (tmps1, "%s/%s", libp->value, r_inputs->value); 450 } 451 else { 452 r_inputs = getMap (request_inputs, "metapath"); 453 if (r_inputs != NULL) 454 sprintf (tmps1, "%s/%s", ntmp, r_inputs->value); 455 else 456 sprintf (tmps1, "%s/", ntmp); 457 458 char *altPath = zStrdup (tmps1); 459 r_inputs = getMap (s1->content, "ServiceProvider"); 460 sprintf (tmps1, "%s/%s", altPath, r_inputs->value); 461 free (altPath); 462 } 453 463 #ifdef DEBUG 454 464 fprintf (stderr, "Trying to load %s\n", tmps1); … … 613 623 errstr = dlerror (); 614 624 #endif 615 sprintf (tmps, _(" C Library can't be loaded%s"), errstr);625 sprintf (tmps, _("Unable to load C Library %s"), errstr); 616 626 errorException(m,tmps,"InternalError",NULL); 617 627 *eres = -1; … … 739 749 map *r_inputs = getMapFromMaps (m, "main", "tmpPath"); 740 750 map *r_inputs1 = getMap (request_inputs, "metapath"); 751 741 752 int hasIn = -1; 742 753 if (r_inputs1 == NULL) … … 883 894 map *r_inputs = NULL; 884 895 map *request_inputs = *inputs; 896 #ifdef IGNORE_METAPATH 897 addToMap(request_inputs, "metapath", ""); 898 #endif 885 899 maps *m = NULL; 886 900 char *REQUEST = NULL; … … 901 915 #endif 902 916 r_inputs = getMapOrFill (&request_inputs, "metapath", ""); 903 904 917 905 918 char conf_file[10240]; … … 1093 1106 } 1094 1107 1095 1096 1108 maps *request_output_real_format = NULL; 1097 1109 map *tmpm = getMapFromMaps (m, "main", "serverAddress"); … … 1112 1124 r_inputs = NULL; 1113 1125 r_inputs = getMap (request_inputs, "metapath"); 1126 1114 1127 if (r_inputs != NULL) 1115 1128 snprintf (conf_dir, 1024, "%s/%s", ntmp, r_inputs->value); … … 1160 1173 if (dirp == NULL) 1161 1174 { 1162 errorException (m, _("The specified path path does n't exist."),1175 errorException (m, _("The specified path path does not exist."), 1163 1176 "InvalidParameterValue", conf_dir); 1164 1177 freeMaps (&m); … … 1375 1388 errorException (m, 1376 1389 _ 1377 (" Unenderstood <request> value. Please check that it was set to GetCapabilities, DescribeProcess orExecute."),1390 ("The <request> value was not recognized. Allowed values are GetCapabilities, DescribeProcess, and Execute."), 1378 1391 "InvalidParameterValue", "request"); 1379 1392 #ifdef DEBUG … … 1441 1454 sprintf (tmpMsg, 1442 1455 _ 1443 ("The value for <identifier> seems to be wrong (%s). Please , ensure that the process exist using theGetCapabilities request."),1456 ("The value for <identifier> seems to be wrong (%s). Please specify one of the processes in the list returned by a GetCapabilities request."), 1444 1457 r_inputs->value); 1445 1458 errorException (m, tmpMsg, "InvalidParameterValue", "identifier"); … … 2786 2799 snprintf (tmps, 1024, 2787 2800 _ 2788 ("The <%s> parameter has a limited size (%sMB) defined in ZOO ServicesProvider configuration file but the reference you provided exceed this limitation (%fMB), please correct your query or the ZOO Configuration file."),2801 ("The <%s> parameter has a size limit (%s MB) defined in the ZOO ServicesProvider configuration file, but the reference you provided exceeds this limit (%f MB)."), 2789 2802 ptr->name, tmp1->value, i); 2790 2803 addToMap (tmpe, "locator", ptr->name); … … 2830 2843 snprintf (tmps, 1024, 2831 2844 _ 2832 ("The <%s> argument was not specified in DataInputs but defined as requested in ZOO ServicesProvider configuration file, please correct your query or the ZOO Configuration file."),2845 ("The <%s> argument was not specified in DataInputs but is required according to the ZOO ServicesProvider configuration file."), 2833 2846 errp->value); 2834 2847 setMapArray (tmpe, "locator", nb , errp->value); … … 2856 2869 snprintf (tmps, 1024, 2857 2870 _ 2858 ("The <%s> argument was specified as %s identifier but not defined in the ZOO Configuration File. Please, correct your query or the ZOO Configuration File."),2871 ("The <%s> argument specified as %s identifier was not recognized (not defined in the ZOO Configuration File)."), 2859 2872 errp->value, 2860 2873 ((getMap(request_inputs,"RawDataOutput")!=NULL)?"RawDataOutput":"ResponseDocument")); … … 3051 3064 errorException (m, 3052 3065 _ 3053 (" Status cannot be set to true with storeExecuteResponse to false. Please,modify your request parameters."),3066 ("The status parameter cannot be set to true if storeExecuteResponse is set to false. Please modify your request parameters."), 3054 3067 "InvalidParameterValue", "storeExecuteResponse"); 3055 3068 freeService (&s1); … … 3270 3283 int cpid = atoi (r_inputs->value); 3271 3284 r_inputs = getMapFromMaps (m, "main", "tmpPath"); 3272 map *r_inputs1 = getMap (s1->content, "ServiceProvider"); 3285 //map *r_inputs1 = getMap (s1->content, "ServiceProvider"); 3286 map* r_inputs1 = createMap("ServiceName", s1->name); 3287 3273 3288 fbkp = 3274 3289 (char *) … … 3357 3372 cpid, m, eres); 3358 3373 fflush (stdout); 3374 3359 3375 /** 3360 3376 * Ensure that if error occurs when freeing memory, no signal will return
Note: See TracChangeset
for help on using the changeset viewer.