Changeset 725 for trunk/zoo-project
- Timestamp:
- Jul 2, 2015, 6:10:28 PM (9 years ago)
- Location:
- trunk/zoo-project
- Files:
-
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/HISTORY.txt
r682 r725 1 1 Version 1.5.0-dev 2 * Completely rewrite of the documentation to use moderne style 2 3 * Fix asynchronous POST request on WIN32 platforms 3 4 * Add utils/registry service -
trunk/zoo-project/zoo-kernel/caching.c
r695 r725 215 215 fcontent=(char*)malloc((hInternet->ihandle[index].nDataLen+1)*sizeof(char)); 216 216 if(fcontent == NULL){ 217 return errorException(*m, _("Unable to allocate memory ."), "InternalError",NULL);217 return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL); 218 218 } 219 219 size_t dwRead; … … 233 233 tmpMap->value=(char*)malloc((fsize+1)*sizeof(char)); 234 234 if(tmpMap->value==NULL){ 235 return errorException(*m, _("Unable to allocate memory ."), "InternalError",NULL);235 return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL); 236 236 } 237 237 memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char)); … … 354 354 tmpMap->value=(char*)malloc((fsize+1)*sizeof(char)); 355 355 if(tmpMap->value==NULL) 356 return errorException(*m, _("Unable to allocate memory ."), "InternalError",NULL);356 return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL); 357 357 memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char)); 358 358 -
trunk/zoo-project/zoo-kernel/locale/po/messages.po
r722 r725 4 4 # Gerald Fenoy <gerald.fenoy@geolabs.fr>, 2015. 5 5 # 6 #, fuzzy 7 msgid "" 8 msgstr "" 9 "Project-Id-Version: ZOO-Kernel Internationalization\n" 6 msgid "" 7 msgstr "" 8 "Project-Id-Version: ZOO-Kernel 1.5.0\n" 10 9 "Report-Msgid-Bugs-To: zoo-discuss@lists.osgeo.org\n" 11 "POT-Creation-Date: 2015-07-0 1 22:23+0200\n"10 "POT-Creation-Date: 2015-07-02 18:06+0200\n" 12 11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 19 18 20 19 #: caching.c:217 caching.c:235 caching.c:356 request_parser.c:214 21 #: request_parser.c:225 request_parser.c:262 request_parser.c:4 4122 #: request_parser.c: 537 request_parser.c:562 request_parser.c:66523 #: request_parser.c: 782 request_parser.c:1112 request_parser.c:120424 #: server_internal.c:1077 zcfg2yaml.c:38 zoo_service_loader.c:25925 #: zoo_service_loader.c: 880 zoo_service_loader.c:136326 #: zoo_service_loader.c:1559 server_internal.c:108227 msgid "Unable to allocate memory ."28 msgstr "Unable to allocate memory ."20 #: request_parser.c:225 request_parser.c:262 request_parser.c:403 21 #: request_parser.c:414 request_parser.c:441 request_parser.c:537 22 #: request_parser.c:562 request_parser.c:665 request_parser.c:782 23 #: request_parser.c:1112 request_parser.c:1204 zcfg2yaml.c:38 24 #: zoo_service_loader.c:259 zoo_service_loader.c:880 zoo_service_loader.c:1363 25 #: zoo_service_loader.c:1559 26 msgid "Unable to allocate memory" 27 msgstr "Unable to allocate memory" 29 28 30 29 #: caching.c:344 … … 52 51 msgstr "Unable to find a valid protocol to download the remote file %s" 53 52 54 #: request_parser.c:403 request_parser.c:41455 msgid "Unable to allocate memory"56 msgstr "Unable to allocate memory"57 58 53 #: request_parser.c:613 59 54 msgid "Unable to add a request in the queue." … … 115 110 msgstr "are" 116 111 117 #: response_print.c:16 28112 #: response_print.c:1630 118 113 #, c-format 119 114 msgid "The service \"%s\" ran successfully." 120 115 msgstr "The service \"%s\" ran successfully." 121 116 122 #: response_print.c:163 6117 #: response_print.c:1638 123 118 #, c-format 124 119 msgid "" … … 129 124 "get the up-to-date status of the service." 130 125 131 #: response_print.c:1642 132 #, c-format 133 msgid "" 126 #: response_print.c:1644 127 #, fuzzy, c-format 128 msgid "" 129 "The service \"%s\" was accepted by the ZOO-Kernel and is running as a " 130 "background task. Please access the URL in the statusLocation attribute " 131 "provided in this document to get the up-to-date status and results." 132 msgstr "" 134 133 "The service \"%s\" was accepted by the ZOO kernel and is running as a " 135 134 "background task. Please access the URL in the statusLocation attribute " 136 135 "provided in this document to get the up-to-date status and results." 137 msgstr "" 138 "The service \"%s\" was accepted by the ZOO kernel and is running as a " 139 "background task. Please access the URL in the statusLocation attribute " 140 "provided in this document to get the up-to-date status and results." 141 142 #: response_print.c:1659 136 137 #: response_print.c:1661 143 138 msgid "No more information available" 144 139 msgstr "No more information available" 145 140 146 #: response_print.c:166 6141 #: response_print.c:1668 147 142 #, c-format 148 143 msgid "error code not know : %i\n" 149 144 msgstr "error code not know : %i\n" 150 145 151 #: response_print.c:17 58146 #: response_print.c:1760 152 147 msgid "Lock failed." 153 148 msgstr "Lock failed." 154 149 155 #: response_print.c:177 1150 #: response_print.c:1773 156 151 #, c-format 157 152 msgid "Unable to create the file \"%s\" for storing the ExecuteResponse." 158 153 msgstr "Unable to create the file \"%s\" for storing the ExecuteResponse." 159 154 160 #: response_print.c:22 88155 #: response_print.c:2290 161 156 msgid "No debug message available" 162 157 msgstr "No debug message available" 163 158 164 #: response_print.c:237 6159 #: response_print.c:2378 165 160 #, c-format 166 161 msgid "Unable to create the file \"%s\" for storing the session maps." 167 162 msgstr "Unable to create the file \"%s\" for storing the session maps." 168 163 169 #: response_print.c:239 2164 #: response_print.c:2394 170 165 msgid "" 171 166 "Unable to run the Service. The message returned back by the Service was the " … … 175 170 "following: " 176 171 177 #: response_print.c:239 3172 #: response_print.c:2395 178 173 #, c-format 179 174 msgid "" … … 184 179 "following: %s" 185 180 186 #: response_print.c:239 6 response_print.c:2397181 #: response_print.c:2398 response_print.c:2399 187 182 msgid "" 188 183 "Unable to run the Service. No more information was returned back by the " … … 192 187 "Service." 193 188 194 #: response_print.c:248 4189 #: response_print.c:2486 195 190 #, c-format 196 191 msgid "Unable to create the file \"%s\" for storing the %s final result." 197 192 msgstr "Unable to create the file \"%s\" for storing the %s final result." 198 193 199 #: response_print.c:257 0194 #: response_print.c:2572 200 195 #, c-format 201 196 msgid "" … … 222 217 msgstr "The job cannot be removed, a file cannot be removed" 223 218 224 #: server_internal.c:1088 zoo_service_loader.c:276 zoo_service_loader.c:1384 225 #: zoo_service_loader.c:1427 server_internal.c:1093 219 #: server_internal.c:1063 220 msgid "Unable to open the registry directory." 221 msgstr "" 222 223 #: server_internal.c:1082 224 msgid "Unable to allocate memory." 225 msgstr "Unable to allocate memory." 226 227 #: server_internal.c:1093 zoo_service_loader.c:276 zoo_service_loader.c:1384 228 #: zoo_service_loader.c:1427 226 229 #, c-format 227 230 msgid "Unable to parse the ZCFG file: %s (%s)" 228 231 msgstr "Unable to parse the ZCFG file: %s (%s)" 229 232 230 #: server_internal.c:109 1zoo_service_loader.c:279 zoo_service_loader.c:1389231 #: zoo_service_loader.c:1431 server_internal.c:1096233 #: server_internal.c:1096 zoo_service_loader.c:279 zoo_service_loader.c:1389 234 #: zoo_service_loader.c:1431 232 235 #, c-format 233 236 msgid "Unable to parse the ZCFG file: %s." … … 308 311 309 312 #: zoo_service_loader.c:1238 310 msgid "The specified path path does not exist." 313 #, fuzzy 314 msgid "The specified path does not exist." 311 315 msgstr "The specified path path does not exist." 312 316 … … 359 363 msgid "Unable to run the child process properly" 360 364 msgstr "Unable to run the child process properly" 361 362 #: server_internal.c:1063363 msgid "Unable to open the registry directory."364 msgstr "" -
trunk/zoo-project/zoo-kernel/request_parser.c
r705 r725 212 212 { 213 213 free(cursor_input); 214 return errorException (*main_conf, _("Unable to allocate memory ."),214 return errorException (*main_conf, _("Unable to allocate memory"), 215 215 "InternalError", NULL); 216 216 } … … 223 223 { 224 224 free(cursor_input); 225 return errorException (*main_conf, _("Unable to allocate memory ."),225 return errorException (*main_conf, _("Unable to allocate memory"), 226 226 "InternalError", NULL); 227 227 } … … 260 260 free(cursor_input); 261 261 return errorException (*main_conf, 262 _("Unable to allocate memory ."),262 _("Unable to allocate memory"), 263 263 "InternalError", NULL); 264 264 } … … 439 439 return errorException (*main_conf, 440 440 _ 441 ("Unable to allocate memory ."),441 ("Unable to allocate memory"), 442 442 "InternalError", NULL); 443 443 } … … 535 535 return errorException (*main_conf, 536 536 _ 537 ("Unable to allocate memory ."),537 ("Unable to allocate memory"), 538 538 "InternalError", NULL); 539 539 } … … 560 560 return errorException (*main_conf, 561 561 _ 562 ("Unable to allocate memory ."),562 ("Unable to allocate memory"), 563 563 "InternalError", NULL); 564 564 } … … 663 663 return errorException (*main_conf, 664 664 _ 665 ("Unable to allocate memory ."),665 ("Unable to allocate memory"), 666 666 "InternalError", 667 667 NULL); … … 780 780 return errorException (*main_conf, 781 781 _ 782 ("Unable to allocate memory ."),782 ("Unable to allocate memory"), 783 783 "InternalError", 784 784 NULL); … … 1110 1110 if (tmpmaps == NULL) 1111 1111 { 1112 return errorException (*main_conf, _("Unable to allocate memory ."),1112 return errorException (*main_conf, _("Unable to allocate memory"), 1113 1113 "InternalError", NULL); 1114 1114 } … … 1202 1202 return errorException (*main_conf, 1203 1203 _ 1204 ("Unable to allocate memory ."),1204 ("Unable to allocate memory"), 1205 1205 "InternalError", NULL); 1206 1206 } -
trunk/zoo-project/zoo-kernel/response_print.c
r720 r725 1642 1642 case SERVICE_ACCEPTED: 1643 1643 nc1 = xmlNewNode(ns, BAD_CAST "ProcessAccepted"); 1644 sprintf(sMsg,_("The service \"%s\" was accepted by the ZOO kernel and is running as a background task. Please access the URL in the statusLocation attribute provided in this document to get the up-to-date status and results."),serv->name);1644 sprintf(sMsg,_("The service \"%s\" was accepted by the ZOO-Kernel and is running as a background task. Please access the URL in the statusLocation attribute provided in this document to get the up-to-date status and results."),serv->name); 1645 1645 nc3=xmlNewText(BAD_CAST sMsg); 1646 1646 xmlAddChild(nc1,nc3); -
trunk/zoo-project/zoo-kernel/zcfg2yaml.c
r640 r725 36 36 s1=(service*)malloc(SERVICE_SIZE); 37 37 if(s1 == NULL){ 38 return errorException(m, _("Unable to allocate memory ."),"InternalError",NULL);38 return errorException(m, _("Unable to allocate memory"),"InternalError",NULL); 39 39 } 40 40 int t=getServiceFromFile(m,conf_file,&s1); -
trunk/zoo-project/zoo-kernel/zoo_service_loader.c
r712 r725 257 257 { 258 258 dup2 (saved_stdout, fileno (stdout)); 259 errorException (m, _("Unable to allocate memory ."),259 errorException (m, _("Unable to allocate memory"), 260 260 "InternalError", NULL); 261 261 return -1; … … 878 878 if (m == NULL) 879 879 { 880 return errorException (m, _("Unable to allocate memory ."),880 return errorException (m, _("Unable to allocate memory"), 881 881 "InternalError", NULL); 882 882 } … … 1236 1236 if (dirp == NULL) 1237 1237 { 1238 errorException (m, _("The specified path pathdoes not exist."),1238 errorException (m, _("The specified path does not exist."), 1239 1239 "InvalidParameterValue", conf_dir); 1240 1240 freeMaps (&m); … … 1361 1361 return errorException (m, 1362 1362 _ 1363 ("Unable to allocate memory ."),1363 ("Unable to allocate memory"), 1364 1364 "InternalError", 1365 1365 NULL); … … 1557 1557 free (REQUEST); 1558 1558 free (SERVICE_URL); 1559 return errorException (m, _("Unable to allocate memory ."),1559 return errorException (m, _("Unable to allocate memory"), 1560 1560 "InternalError", NULL); 1561 1561 }
Note: See TracChangeset
for help on using the changeset viewer.