Index: branches/branch-1.2/testing/README =================================================================== --- branches/branch-1.2/testing/README (revision 268) +++ branches/branch-1.2/testing/README (revision 268) @@ -0,0 +1,30 @@ +Please use the following syntaxe: + + ./run.sh + +where should be the url to a WPS Server and should +be the service name you want to run tests with. + +For instance to test the Buffer service on a localhost WPS server, use the +following command: + + ./run.sh http://localhost/cgi-bin/zoo_loader.cgi Buffer + + +Important note: sometimes XML validation failed because xmllint is unable to download +a file required to validate. In such case, you can use the file /etc/xml/catalog on your +local machine to use a local copy of the missing file. + +For instance, in case xml.xsd can't be downloaded, then you can download a copy using +this url http://www.w3.org/2001/xml.xsd, store it in /etc/schemas directory and then +use the following /etc/xml/catalog file: + + + + + + + +Obviously, you can do similar manipulation for the OGC schemas to use local files +rather than downloading them for each tests. Index: branches/branch-1.2/testing/extractStatusLocation.xsl =================================================================== --- branches/branch-1.2/testing/extractStatusLocation.xsl (revision 268) +++ branches/branch-1.2/testing/extractStatusLocation.xsl (revision 268) @@ -0,0 +1,15 @@ + + + + + + + + + + + Index: branches/branch-1.2/testing/requests/dp.xml =================================================================== --- branches/branch-1.2/testing/requests/dp.xml (revision 268) +++ branches/branch-1.2/testing/requests/dp.xml (revision 268) @@ -0,0 +1,4 @@ + + + ServiceName + Index: branches/branch-1.2/testing/requests/igml_o.xml =================================================================== --- branches/branch-1.2/testing/requests/igml_o.xml (revision 268) +++ branches/branch-1.2/testing/requests/igml_o.xml (revision 268) @@ -0,0 +1,19 @@ + +ServiceName + + +InputPolygon +Playground area + +unknown-105.99836,31.393818 -106.212753,31.478128 -106.383041,31.733763 -106.538971,31.786198 -106.614441,31.817728 -106.615578,31.844635 -106.643532,31.895102 -106.633202,31.913998 -106.632057,31.972118 -106.649513,31.980228 -106.623077,32.000988 -106.377846,32.000645 -106.002708,32.001553 -104.921799,32.004269 -104.850563,32.003151 -104.018814,32.007278 -103.980896,32.00589 -103.728973,32.006104 -103.332092,32.004154 -103.057968,32.0019 -103.055191,32.084995 -103.059547,32.51543 -103.048836,32.953533 -103.042603,33.377728 -103.038239,33.565742 -103.032761,33.826088 -103.029144,34.307743 -103.022156,34.745266 -103.02475,34.964718 -103.02565,35.177208 -103.021797,35.623604 -103.022118,35.742287 -103.02356,36.056026 -103.026802,36.491566 -102.996918,36.492344 -102.165222,36.490208 -102.03421,36.492954 -101.620316,36.492004 -101.089668,36.488022 -100.956909,36.489609 -100.549416,36.489449 -100.006866,36.493877 -100.001144,36.492519 -99.997154,36.057549 -99.997726,35.883793 -100,35.618809 -99.994354,35.424572 -99.997185,35.182182 -99.996071,35.030998 -99.998878,34.747185 -99.996094,34.562321 -99.972099,34.561863 -99.94474,34.579571 -99.931908,34.579109 -99.8806,34.548176 -99.860573,34.518627 -99.829933,34.501778 -99.777687,34.443993 -99.684906,34.377445 -99.601448,34.368557 -99.58522,34.384857 -99.57785,34.408913 -99.553864,34.41518 -99.502136,34.404068 -99.479439,34.383522 -99.438377,34.364704 -99.409958,34.369106 -99.394157,34.396744 -99.392792,34.428993 -99.364204,34.450195 -99.323296,34.412708 -99.267174,34.398285 -99.254105,34.368214 -99.20549,34.331993 -99.196304,34.305122 -99.204597,34.255646 -99.190483,34.223736 -99.176155,34.21273 -99.127945,34.201469 -99.07843,34.208359 -99.035217,34.198921 -98.996193,34.209496 -98.952507,34.194565 -98.891342,34.16082 -98.811066,34.145935 -98.778534,34.131962 -98.705292,34.130714 -98.682213,34.149998 -98.66172,34.147038 -98.625992,34.158436 -98.607246,34.151398 -98.576332,34.14193 -98.557579,34.105335 -98.499519,34.066414 -98.448189,34.054375 -98.421341,34.06583 -98.407135,34.082455 -98.390953,34.087231 -98.384254,34.11578 -98.350403,34.14212 -98.320488,34.13942 -98.277,34.122871 -98.172844,34.115368 -98.136864,34.138432 -98.114868,34.148987 -98.094124,34.134556 -98.110687,34.06982 -98.086205,34.005314 -98.055557,33.989799 -98.023491,33.986984 -97.982681,34.001286 -97.950226,33.971161 -97.947754,33.959751 -97.962997,33.94865 -97.950684,33.932518 -97.976128,33.912052 -97.976379,33.902504 -97.954735,33.88348 -97.909065,33.874023 -97.869751,33.855114 -97.852547,33.857071 -97.790207,33.890457 -97.756363,33.932098 -97.729019,33.939293 -97.704262,33.971546 -97.671066,33.988613 -97.600182,33.969437 -97.592354,33.917885 -97.575668,33.902531 -97.554588,33.903904 -97.518204,33.916771 -97.477531,33.907707 -97.462761,33.902382 -97.457062,33.89043 -97.452736,33.836212 -97.410118,33.820709 -97.363319,33.831024 -97.341805,33.861916 -97.314957,33.870392 -97.314087,33.89584 -97.272278,33.872574 -97.263908,33.85873 -97.250687,33.872971 -97.246063,33.894238 -97.211334,33.905689 -97.187767,33.899204 -97.164169,33.863148 -97.168594,33.847794 -97.195015,33.836159 -97.208321,33.819649 -97.189163,33.752769 -97.152473,33.728668 -97.115562,33.725933 -97.0905,33.73167 -97.083466,33.742413 -97.087669,33.807571 -97.050026,33.823448 -97.078247,33.837811 -97.082176,33.851101 -97.0709,33.856728 -97.025597,33.840561 -97.005852,33.850513 -96.987709,33.876423 -96.987862,33.944202 -96.968185,33.937321 -96.936203,33.947849 -96.929565,33.961773 -96.898453,33.950027 -96.882851,33.924591 -96.878937,33.884003 -96.861015,33.861679 -96.844009,33.858032 -96.814117,33.871769 -96.797592,33.869949 -96.748825,33.831738 -96.711678,33.83387 -96.693382,33.847904 -96.677704,33.904324 -96.666237,33.913544 -96.584488,33.896145 -96.614166,33.8629 -96.601196,33.842957 -96.562134,33.82542 -96.510574,33.815685 -96.500748,33.78809 -96.487373,33.77813 -96.419464,33.788326 -96.370819,33.740395 -96.347588,33.705528 -96.316277,33.701801 -96.300789,33.71405 -96.28968,33.761932 -96.278076,33.773388 -96.212547,33.756691 -96.187027,33.758583 -96.168816,33.769356 -96.161316,33.798229 -96.141418,33.82032 -96.154518,33.823944 -96.180725,33.808434 -96.183128,33.815792 -96.169205,33.828983 -96.148964,33.83559 -96.109444,33.829258 -96.091522,33.844578 -96.047974,33.841278 -96.026749,33.856022 -96.014069,33.844208 -96.001793,33.856979 -96.002617,33.87339 -95.994209,33.875378 -95.977394,33.857952 -95.958763,33.86504 -95.943069,33.889973 -95.933075,33.89053 -95.846558,33.841038 -95.825974,33.843025 -95.795479,33.864674 -95.768517,33.851402 -95.764252,33.879005 -95.760696,33.89344 -95.746864,33.903397 -95.699707,33.894825 -95.633492,33.920105 -95.612984,33.920238 -95.61483,33.936691 -95.606071,33.944553 -95.562775,33.936073 -95.546318,33.904034 -95.519577,33.906643 -95.526733,33.897816 -95.547493,33.893158 -95.544037,33.885742 -95.512886,33.897736 -95.498856,33.881718 -95.468124,33.886433 -95.451607,33.865753 -95.33004,33.870918 -95.336227,33.897114 -95.301956,33.886623 -95.28643,33.886902 -95.277351,33.917938 -95.263618,33.8978 -95.250992,33.905022 -95.251289,33.936443 -95.234039,33.964863 -95.148315,33.943546 -95.127968,33.940868 -95.126678,33.917145 -95.119225,33.912281 -95.09536,33.921738 -95.082268,33.918453 -95.089714,33.896915 -95.083603,33.888462 -95.063477,33.917648 -95.063141,33.896694 -95.042862,33.884445 -95.037361,33.866451 -95.012772,33.869946 -94.989281,33.856182 -94.968704,33.866215 -94.959908,33.848076 -94.939888,33.840824 -94.940399,33.815807 -94.918236,33.816196 -94.908546,33.803478 -94.913879,33.789597 -94.881638,33.774963 -94.85788,33.749321 -94.81916,33.749405 -94.803223,33.739582 -94.783508,33.753262 -94.764175,33.752842 -94.782028,33.742268 -94.783157,33.733665 -94.749771,33.736706 -94.762718,33.716797 -94.742111,33.719048 -94.754478,33.707771 -94.741653,33.701267 -94.690987,33.690289 -94.668457,33.696537 -94.655479,33.692291 -94.644325,33.67765 -94.667953,33.671459 -94.669426,33.666061 -94.658539,33.663738 -94.638763,33.670105 -94.631737,33.683899 -94.600945,33.665607 -94.585106,33.678982 -94.578506,33.670471 -94.560722,33.671913 -94.565208,33.663013 -94.585159,33.662132 -94.588387,33.655449 -94.576462,33.652157 -94.545418,33.661621 -94.541931,33.648247 -94.562195,33.64283 -94.562149,33.635536 -94.550194,33.632694 -94.51799,33.643009 -94.525055,33.621021 -94.510559,33.63081 -94.50061,33.623047 -94.476486,33.631966 -94.435913,33.636444 -94.436333,33.616844 -94.451553,33.604347 -94.443329,33.596504 -94.428467,33.597141 -94.40657,33.573486 -94.393417,33.574959 -94.379112,33.593327 -94.370628,33.590042 -94.372307,33.572662 -94.395264,33.560303 -94.370758,33.547684 -94.328751,33.573135 -94.302383,33.556934 -94.29882,33.579853 -94.278984,33.589333 -94.272079,33.584606 -94.274544,33.561737 -94.237236,33.592422 -94.223038,33.58572 -94.235367,33.561535 -94.210884,33.557987 -94.205345,33.585079 -94.159515,33.593773 -94.155167,33.567085 -94.098701,33.572998 -94.086655,33.583954 -94.061432,33.577213 -94.035927,33.555912 -94.036507,33.270325 -94.03875,33.023289 -94.041603,32.882347 -94.040199,32.694813 -94.035233,32.389225 -94.034767,32.199448 -94.035065,31.994513 -94.009888,31.989134 -94.004395,31.977942 -93.977211,31.946159 -93.969986,31.923164 -93.93573,31.909456 -93.917923,31.909702 -93.923462,31.892593 -93.899261,31.894455 -93.892525,31.870066 -93.881264,31.87142 -93.877403,31.850113 -93.864822,31.817272 -93.834328,31.802017 -93.822067,31.774637 -93.831161,31.753281 -93.80999,31.730352 -93.814949,31.712351 -93.808769,31.707565 -93.792267,31.711395 -93.811844,31.674566 -93.806427,31.653767 -93.814728,31.647966 -93.819588,31.618092 -93.835579,31.615189 -93.832619,31.590183 -93.816322,31.57711 -93.810516,31.559063 -93.780128,31.533735 -93.763306,31.530724 -93.747543,31.537718 -93.731659,31.521877 -93.705795,31.520569 -93.718994,31.495403 -93.750435,31.490557 -93.751244,31.4855 -93.726784,31.459475 -93.698418,31.461458 -93.701927,31.446251 -93.687004,31.438131 -93.696129,31.427736 -93.694443,31.415922 -93.687492,31.40613 -93.664017,31.398329 -93.661072,31.372395 -93.634857,31.373827 -93.67704,31.328386 -93.681587,31.312679 -93.656128,31.286671 -93.645592,31.290262 -93.630829,31.273903 -93.616455,31.275805 -93.611877,31.270033 -93.611,31.242188 -93.590546,31.229687 -93.602921,31.199066 -93.593941,31.180199 -93.576942,31.17214 -93.550591,31.190929 -93.528923,31.185774 -93.526932,31.178076 -93.537018,31.17634 -93.528328,31.162943 -93.544189,31.159166 -93.537506,31.132441 -93.528091,31.125925 -93.535088,31.116072 -93.556679,31.109343 -93.559982,31.100536 -93.543121,31.094751 -93.544106,31.082373 -93.516998,31.074671 -93.525742,31.05698 -93.507217,31.038908 -93.547119,31.014141 -93.564941,31.018063 -93.567894,31.012924 -93.570847,30.997271 -93.560951,30.99169 -93.572456,30.976177 -93.548676,30.97019 -93.537338,30.956884 -93.532188,30.960732 -93.52562,30.93582 -93.529984,30.926971 -93.549622,30.924885 -93.546516,30.905334 -93.564476,30.901932 -93.568497,30.886234 -93.560844,30.87188 -93.552803,30.860283 -93.566444,30.845148 -93.555641,30.842342 -93.550682,30.828344 -93.581871,30.80204 -93.585175,30.772184 -93.618454,30.745789 -93.607651,30.73201 -93.61779,30.732548 -93.612411,30.710329 -93.617607,30.686802 -93.659988,30.672859 -93.677971,30.639692 -93.692879,30.640041 -93.684586,30.623425 -93.692696,30.615795 -93.671585,30.597832 -93.69342,30.598835 -93.717812,30.587379 -93.71788,30.568153 -93.735306,30.545517 -93.70546,30.522858 -93.714638,30.505114 -93.707275,30.496241 -93.714851,30.488628 -93.697975,30.470047 -93.703423,30.462513 -93.696571,30.442633 -93.721535,30.43298 -93.742561,30.408823 -93.754944,30.381788 -93.747833,30.367411 -93.759338,30.354145 -93.759178,30.340872 -93.729774,30.304916 -93.699211,30.297388 -93.707359,30.239372 -93.714844,30.220306 -93.704361,30.180861 -93.696167,30.175676 -93.699661,30.150808 -93.683144,30.148232 -93.685959,30.141253 -93.698639,30.141226 -93.696922,30.117929 -93.708382,30.11474 -93.715858,30.095669 -93.712479,30.06052 -93.760201,30.005964 -93.857277,29.990654 -93.856331,29.964602 -93.951767,29.818363 -93.834961,29.67457 -94.065407,29.674076 -94.356995,29.5599 -94.377007,29.55197 -94.682518,29.432905 -94.766548,29.363993 -94.785248,29.383261 -94.681915,29.475111 -94.572693,29.533052 -94.501282,29.517523 -94.469795,29.55678 -94.510811,29.545147 -94.533699,29.553984 -94.564438,29.578999 -94.788086,29.538557 -94.706421,29.658516 -94.700279,29.754568 -94.735725,29.792986 -94.829414,29.759857 -94.887161,29.668539 -94.932587,29.682209 -95.088264,29.80398 -95.040398,29.711578 -94.989334,29.679701 -95.014122,29.559265 -94.911156,29.500334 -94.982811,29.460527 -94.943756,29.464682 -94.952507,29.424234 -94.913445,29.420113 -94.916992,29.447823 -94.891136,29.399324 -94.815353,29.370932 -94.891472,29.393831 -94.898788,29.308775 -94.951134,29.325922 -95.066368,29.195877 -95.160522,29.200031 -95.16478,29.117548 -95.197342,29.105223 -95.248405,28.978392 -95.526581,28.803242 -95.683029,28.726954 -95.671318,28.752682 -95.786354,28.738871 -95.937309,28.690454 -95.956146,28.622673 -95.702148,28.718987 -96.206581,28.488386 -95.991646,28.596424 -95.983749,28.653133 -96.237587,28.571321 -96.239029,28.597116 -96.157471,28.611231 -96.240456,28.634859 -96.151062,28.762672 -96.212173,28.68672 -96.285973,28.661724 -96.270378,28.708981 -96.326157,28.634089 -96.364159,28.617981 -96.391777,28.670252 -96.392731,28.726028 -96.427086,28.712013 -96.449677,28.755035 -96.432259,28.697248 -96.403397,28.719494 -96.418785,28.638664 -96.375397,28.610088 -96.491203,28.556944 -96.437157,28.596991 -96.454384,28.655933 -96.483269,28.598055 -96.511894,28.608181 -96.511734,28.649542 -96.570396,28.636267 -96.570557,28.691841 -96.572212,28.808174 -96.576485,28.690689 -96.591499,28.71736 -96.646515,28.714142 -96.660011,28.679075 -96.606705,28.623634 -96.610344,28.558941 -96.566704,28.574099 -96.48658,28.506222 -96.563194,28.469627 -96.518501,28.460827 -96.476501,28.499454 -96.390724,28.434059 -96.661308,28.306263 -96.702362,28.340197 -96.703812,28.395885 -96.740768,28.403458 -96.787094,28.477507 -96.823875,28.44964 -96.788338,28.446255 -96.759102,28.410912 -96.77536,28.39163 -96.853493,28.404997 -96.788231,28.35247 -96.78627,28.312859 -96.793335,28.271372 -96.777931,28.229349 -96.803688,28.211447 -96.950905,28.114355 -96.91272,28.256798 -96.975304,28.210751 -96.941071,28.186771 -96.975105,28.115046 -97.033615,28.137398 -97.023567,28.199797 -97.131836,28.130426 -97.135414,28.16181 -97.167992,28.15946 -97.157059,28.116381 -97.260284,28.064724 -97.241234,28.048653 -97.270294,28.025932 -97.236214,28.04052 -97.123077,28.054266 -97.026405,28.10775 -97.023804,28.020237 -97.114624,27.915386 -97.195465,27.81222 -97.247025,27.822319 -97.213341,27.83111 -97.283485,27.871145 -97.361046,27.839954 -97.345619,27.873178 -97.479355,27.852962 -97.496681,27.875469 -97.521698,27.863626 -97.499535,27.843243 -97.479813,27.820282 -97.388542,27.831427 -97.396561,27.77084 -97.317795,27.712225 -97.34951,27.715328 -97.320015,27.690634 -97.353363,27.6408 -97.399216,27.633186 -97.347504,27.631439 -97.309212,27.707863 -97.249794,27.688831 -97.331459,27.562321 -97.412262,27.321024 -97.500435,27.319668 -97.507538,27.439215 -97.528381,27.344101 -97.600113,27.300135 -97.750076,27.419666 -97.680008,27.294373 -97.784744,27.28772 -97.548157,27.230207 -97.427216,27.265133 -97.503502,27.081541 -97.478996,26.996508 -97.568565,26.977858 -97.558052,26.846052 -97.495575,26.793781 -97.451698,26.600985 -97.425858,26.518225 -97.474709,26.476805 -97.421188,26.385059 -97.368698,26.35906 -97.353363,26.182449 -97.25312,26.068316 -97.276321,26.002275 -97.213097,26.009068 -97.172226,25.954569 -97.307144,25.965124 -97.304436,25.938663 -97.380989,25.917021 -97.385643,25.845362 -97.434349,25.845198 -97.590088,25.933231 -97.574936,25.954172 -97.612923,25.962002 -97.647972,26.023445 -97.867432,26.060141 -98.04007,26.059395 -98.076347,26.034626 -98.083214,26.065758 -98.200691,26.055376 -98.291946,26.098104 -98.271355,26.120895 -98.292274,26.132809 -98.327934,26.111647 -98.347191,26.15868 -98.384521,26.156031 -98.453392,26.220911 -98.488518,26.201544 -98.599968,26.260454 -98.677917,26.242056 -98.819832,26.375071 -98.908897,26.360329 -98.93927,26.395309 -99.106728,26.419531 -99.101471,26.48834 -99.168678,26.545729 -99.165817,26.579889 -99.285522,26.857361 -99.390518,26.94663 -99.392715,26.99555 -99.455063,27.028648 -99.437157,27.199198 -99.465271,27.269884 -99.543587,27.318653 -99.490494,27.490755 -99.526741,27.504284 -99.549187,27.612627 -99.714493,27.661558 -99.815727,27.780107 -99.874733,27.797686 -99.941856,27.986881 -99.993309,28.00346 -100.096924,28.154282 -100.214073,28.201935 -100.223465,28.241457 -100.29792,28.280354 -100.292892,28.32036 -100.35157,28.394182 -100.37677,28.478651 -100.345802,28.500811 -100.419533,28.544191 -100.403175,28.589733 -100.49791,28.660988 -100.58979,28.894222 -100.647224,28.92235 -100.66877,29.080072 -100.768608,29.166571 -100.796989,29.242502 -101.009056,29.373255 -101.06736,29.473553 -101.261429,29.526474 -101.254585,29.62875 -101.308929,29.58091 -101.305862,29.652431 -101.368401,29.657162 -101.4161,29.745434 -101.401276,29.769905 -101.448425,29.760586 -101.470467,29.788691 -101.538345,29.763018 -101.543953,29.81012 -101.58149,29.76515 -101.639671,29.75696 -101.759094,29.787167 -101.805206,29.779999 -101.819099,29.814125 -101.924225,29.788502 -101.97332,29.818773 -102.063995,29.784571 -102.324333,29.880116 -102.367561,29.845289 -102.384796,29.767946 -102.503098,29.785456 -102.551949,29.7495 -102.5765,29.778248 -102.637611,29.732338 -102.676361,29.744225 -102.804726,29.530146 -102.822205,29.411844 -102.883011,29.353371 -102.908325,29.269203 -102.866173,29.229036 -102.988098,29.190863 -103.153465,28.978682 -103.266586,29.007454 -103.28035,28.986374 -103.335518,29.050339 -103.37545,29.032108 -103.474075,29.072134 -103.526237,29.146646 -103.720314,29.190632 -103.739853,29.230349 -103.782158,29.229795 -103.767761,29.28124 -103.786995,29.26726 -104.045631,29.328119 -104.164383,29.400715 -104.204735,29.484041 -104.377594,29.550611 -104.535248,29.679466 -104.57756,29.807936 -104.67437,29.909283 -104.696495,30.057302 -104.674759,30.148964 -104.702614,30.238489 -104.813957,30.35047 -104.806473,30.376448 -104.852997,30.392263 -104.890678,30.570557 -104.986931,30.641325 -104.997543,30.684334 -105.060562,30.68787 -105.21434,30.812086 -105.258186,30.797653 -105.287598,30.831949 -105.313782,30.816507 -105.390312,30.853081 -105.409065,30.90251 -105.554382,30.998285 -105.603218,31.086428 -105.76973,31.17078 -105.99836,31.393818-94.913429,29.257572 -94.76738,29.342451 -94.748405,29.31949 -95.105415,29.096958 -94.913429,29.257572-96.397881,28.345846 -96.834625,28.066322 -96.803841,28.172161 -96.738907,28.183535 -96.532135,28.318245 -96.463051,28.325832 -96.422554,28.391439 -96.397881,28.345846-96.939964,28.045933 -96.872421,28.131405 -96.837425,28.101841 -96.853806,28.049402 -97.049606,27.840954 -97.024429,27.914381 -96.949387,27.984526 -96.973,28.000853 -96.939964,28.045933-97.359116,27.283718 -97.379379,27.210453 -97.376091,27.284643 -97.335503,27.440819 -97.248672,27.581133 -97.258682,27.651749 -97.203583,27.612064 -97.170181,27.70746 -97.075294,27.811274 -97.113037,27.819216 -97.053566,27.830473 -97.223717,27.574007 -97.359116,27.283718-97.301132,26.601023 -97.358025,26.706646 -97.381332,26.820375 -97.395309,26.921988 -97.400909,27.111227 -97.388786,27.201651 -97.378532,27.204449 -97.386925,27.097244 -97.381332,26.949022 -97.358025,26.802664 -97.295837,26.60067 -97.232109,26.418142 -97.194992,26.259241 -97.171799,26.077721 -97.179337,26.07192 -97.208916,26.250542 -97.226311,26.348551 -97.251251,26.419304 -97.26725,26.478905 -97.278549,26.539963 -97.301132,26.601023Texas48W S CenTX688219.0717337.5491.712202E74377106.06115966.08433346.000000018688674.06192585.05860490.01142908.0168814.07687338.0590269.02139266.01042397.00.4930.5072487642.0 + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/ijson_o.xml =================================================================== --- branches/branch-1.2/testing/requests/ijson_o.xml (revision 268) +++ branches/branch-1.2/testing/requests/ijson_o.xml (revision 268) @@ -0,0 +1,19 @@ + +ServiceName + + +InputPolygon +Playground area + +{"type":"Polygon","coordinates":[[[-102.036758,36.988972],[-106.860657,36.989491],[-109.047821,36.996643],[-109.055199,38.24493],[-109.052864,39.518196],[-109.050591,40.210545],[-109.047638,40.998474],[-107.918037,41.00341],[-104.051201,41.003227],[-102.620789,41.000225],[-102.047279,40.998077],[-102.04557,40.697323],[-102.036758,36.988972]]]} + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/ir_o.xml =================================================================== --- branches/branch-1.2/testing/requests/ir_o.xml (revision 268) +++ branches/branch-1.2/testing/requests/ir_o.xml (revision 268) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/ir_o_async.xml =================================================================== --- branches/branch-1.2/testing/requests/ir_o_async.xml (revision 268) +++ branches/branch-1.2/testing/requests/ir_o_async.xml (revision 268) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/ir_or.xml =================================================================== --- branches/branch-1.2/testing/requests/ir_or.xml (revision 268) +++ branches/branch-1.2/testing/requests/ir_or.xml (revision 268) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/ir_or_async.xml =================================================================== --- branches/branch-1.2/testing/requests/ir_or_async.xml (revision 268) +++ branches/branch-1.2/testing/requests/ir_or_async.xml (revision 268) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/irb_o.xml =================================================================== --- branches/branch-1.2/testing/requests/irb_o.xml (revision 268) +++ branches/branch-1.2/testing/requests/irb_o.xml (revision 268) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/irb_o_async.xml =================================================================== --- branches/branch-1.2/testing/requests/irb_o_async.xml (revision 268) +++ branches/branch-1.2/testing/requests/irb_o_async.xml (revision 268) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/irb_or.xml =================================================================== --- branches/branch-1.2/testing/requests/irb_or.xml (revision 268) +++ branches/branch-1.2/testing/requests/irb_or.xml (revision 268) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: branches/branch-1.2/testing/requests/irb_or_async.xml =================================================================== --- branches/branch-1.2/testing/requests/irb_or_async.xml (revision 268) +++ branches/branch-1.2/testing/requests/irb_or_async.xml (revision 268) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: branches/branch-1.2/testing/run.sh =================================================================== --- branches/branch-1.2/testing/run.sh (revision 268) +++ branches/branch-1.2/testing/run.sh (revision 268) @@ -0,0 +1,93 @@ +#!/bin/bash + +Usage=$(cat < + +where should be the url to a WPS Server and should +be the service name you want to run tests with. + +For instance to test the Buffer service on a localhost WPS server, use the +following command: + + ./run.sh http://localhost/cgi-bin/zoo_loader.cgi Buffer + +EOF +) + +if [ -z "$1" ] || [ -z "$2" ]; then + echo "$Usage" + exit +fi + +WPSInstance=$1 +ServiceName=$2 + +function kvpRequest { + echo "Simple KVP request " + echo "$1" + curl -o "$2" "$1" + echo "Checking for ${3} response XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" +} + +function postRequest { + echo "Simple POST request " + echo "Checking for ${3} request XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_request.xsd "$4" + curl -H "Content-type: text/xml" -d@"$4" -o "$2" "$1" + echo "Checking for ${3} response XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" + if [ -z "$5" ]; then + echo "" + else + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$(xsltproc ./extractStatusLocation.xsl $2)" + fi +} + + +# +# Tests for GetCapabilities using KVP and POST requests +# +kvpRequest "${WPSInstance}?request=GetCapabilities&service=WPS" "tmp/outputGC1.xml" "GetCapabilities" + +kvpRequest "${WPSInstance}?REQUEST=GetCapabilities&SERVICE=WPS" "tmp/outputGC2.xml" "GetCapabilities" + +echo "Check if differences between upper case and lower case parameter names" +diff -ru tmp/outputGC1.xml tmp/outputGC2.xml + +echo "" + +curl -o tmp/10_wpsGetCapabilities_request.xml http://schemas.opengis.net/wps/1.0.0/examples/10_wpsGetCapabilities_request.xml +postRequest "${WPSInstance}" "tmp/outputGCp.xml" "GetCapabilities" "tmp/10_wpsGetCapabilities_request.xml" +echo "" + +# +# Tests for DescribeProcess using KVP and POST requests +# +kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&version=1.0.0&Identifier=ALL" "tmp/outputDPall.xml" "DescribeProcess" + +kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&version=1.0.0&Identifier=${ServiceName}" "tmp/outputDPb1.xml" "DescribeProcess" + +echo "" + +cat requests/dp.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/dp1.xml +postRequest "${WPSInstance}" "tmp/outputDPp.xml" "DescribeProcess" "tmp/dp1.xml" +echo "" + +# +# Tests for Execute using KVP and POST requests +# +for i in ijson_o igml_o ir_o ir_o_async ir_or ir_or_async irb_o irb_o_async irb_or irb_or_async; +do + cat requests/${i}.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/${i}1.xml + if [ -z "$(echo $i | grep async)" ]; then + postRequest "${WPSInstance}" "tmp/outputE${i}.xml" "Execute" "tmp/${i}1.xml" + else + postRequest "${WPSInstance}" "tmp/outputE${i}.xml" "Execute" "tmp/${i}1.xml" "async" + fi + echo "" +done + +echo "" Index: branches/branch-1.2/thirds/include/unistd.h =================================================================== --- branches/branch-1.2/thirds/include/unistd.h (revision 268) +++ branches/branch-1.2/thirds/include/unistd.h (revision 268) @@ -0,0 +1,6 @@ +#ifndef __STRICT_AINSI__ + +#include +#include + +#endif Index: branches/branch-1.2/zoo-kernel/main.cfg =================================================================== --- branches/branch-1.2/zoo-kernel/main.cfg (revision 220) +++ branches/branch-1.2/zoo-kernel/main.cfg (revision 268) @@ -6,4 +6,5 @@ tmpPath=/YourFullTmpPathHere/ tmpUrl = ../TmpPathRelativeToServerAdress/ +dataPath = /YouFullDataPathHere/ [identification] @@ -20,5 +21,5 @@ positionName=Developer role=Dev -adressDeliveryPoint=1280, avenue des Platanes +addressDeliveryPoint=1280, avenue des Platanes addressCity=Lattes addressAdministrativeArea=False Index: branches/branch-1.2/zoo-kernel/main_conf_read.y =================================================================== --- branches/branch-1.2/zoo-kernel/main_conf_read.y (revision 220) +++ branches/branch-1.2/zoo-kernel/main_conf_read.y (revision 268) @@ -47,9 +47,5 @@ /* le type des lval des jetons et des elements non terminaux bison */ //====================================================== -%union -{ - char * s; -} -%union { char* chaine; char* key;char* val;} +%union { char* s;char* chaine; char* key;char* val;} //====================================================== Index: branches/branch-1.2/zoo-kernel/nmake.opt =================================================================== --- branches/branch-1.2/zoo-kernel/nmake.opt (revision 220) +++ branches/branch-1.2/zoo-kernel/nmake.opt (revision 268) @@ -9,6 +9,5 @@ CPP=cl /TP $(CFLAGS) -CFLAGS=-DUSE_PYTHON /EHa /nologo /MT /W3 /EHsc /O2 /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I./ -I..\thirds\dirent-win32 -I$(PYTHON_CPATH)\include -I$(GEODIR)/include -ILIBINTL_CPATH\include -I$(TPATH)\include -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF +CFLAGS=-DUSE_PYTHON /EHa /nologo /MT /W3 /EHsc /O2 /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I./ -I..\thirds\dirent-win32 -I..\thirds\include -I$(PYTHON_CPATH)\include -I$(GEODIR)/include -ILIBINTL_CPATH\include -I$(TPATH)\include -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF -LDFLAGS=$(GEODIR)/lib/libfcgi.lib $(GEODIR)/lib/libcurl_im -p.lib $(GEODIR)/apps/Python25/libs/python25.lib $(GEODIR)/lib/libxml2.lib ../thirds/cgic206/libcgic.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)\..\lib\libeay32.dll.a $(TOOLS)\..\lib\libcrypto.a $(TOOLS)\..\lib\libssl32.dll.a $(TOOLS)\..\lib\libintl.lib /machine:i386 +LDFLAGS=$(GEODIR)/lib/libfcgi.lib $(GEODIR)/lib/libcurl_imp.lib $(GEODIR)/apps/Python25/libs/python25.lib $(GEODIR)/lib/libxml2.lib ../thirds/cgic206/libcgic.lib $(GEODIR)/lib/gdal_i.lib $(TOOLS)\..\lib\libeay32.dll.a $(TOOLS)\..\lib\libcrypto.a $(TOOLS)\..\lib\libssl32.dll.a $(TOOLS)\..\lib\libintl.lib /machine:i386 Index: branches/branch-1.2/zoo-kernel/service.h =================================================================== --- branches/branch-1.2/zoo-kernel/service.h (revision 220) +++ branches/branch-1.2/zoo-kernel/service.h (revision 268) @@ -124,5 +124,6 @@ map* tmp=t; while(tmp!=NULL){ - fprintf(file,"%s = %s\n",t->name,t->value); + fprintf(stderr,"%s = %s\n",tmp->name,tmp->value); + fprintf(file,"%s = %s\n",tmp->name,tmp->value); tmp=tmp->next; } @@ -138,10 +139,13 @@ } - static void dumpMapsToFile(maps* m,FILE* file){ + static void dumpMapsToFile(maps* m,char* file_path){ + FILE* file=fopen(file_path,"w"); maps* tmp=m; if(tmp!=NULL){ fprintf(file,"[%s]\n",tmp->name); dumpMapToFile(tmp->content,file); - } + fflush(file); + } + fclose(file); } @@ -549,6 +553,7 @@ map* tmpV=getMap(res->content,"value"); free(tmpV->value); - tmpV->value=(char*)malloc(atoi(tmp->value)*sizeof(char)); + tmpV->value=(char*)malloc((atoi(tmp->value)+1)*sizeof(char)); memmove(tmpV->value,tmpSized,atoi(tmp->value)*sizeof(char)); + tmpV->value[atoi(tmp->value)]=0; free(tmpSized); } Index: branches/branch-1.2/zoo-kernel/service_conf.l =================================================================== --- branches/branch-1.2/zoo-kernel/service_conf.l (revision 220) +++ branches/branch-1.2/zoo-kernel/service_conf.l (revision 268) @@ -41,5 +41,5 @@ attname [a-zA-Z0-9_\-]+ -attvalue1 [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|]+ +attvalue1 [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>]+ attvalue \"[^"]*\"|\'[^']*\'\(\) Index: branches/branch-1.2/zoo-kernel/service_conf.y =================================================================== --- branches/branch-1.2/zoo-kernel/service_conf.y (revision 220) +++ branches/branch-1.2/zoo-kernel/service_conf.y (revision 268) @@ -356,5 +356,22 @@ //====================================================== EmptyElemTag - : INFCAR ID Attributeetoile SLASH SUPCAR {} + : INFCAR ID Attributeetoile SLASH SUPCAR { + if(strncasecmp($2,"Default",7)==0){ + wait_defaults=false; + current_data=previous_data; + if(current_element->defaults==NULL){ + current_element->defaults=(iotype*)malloc(IOTYPE_SIZE); + current_element->defaults->content=NULL; + } + addMapToMap(¤t_element->defaults->content,current_content); + freeMap(¤t_content); + free(current_content); + current_element->defaults->next=NULL; + wait_defaults=false; + current_content=NULL; + current_element->supported=NULL; + current_element->next=NULL; + } + } ; Index: branches/branch-1.2/zoo-kernel/service_internal.c =================================================================== --- branches/branch-1.2/zoo-kernel/service_internal.c (revision 220) +++ branches/branch-1.2/zoo-kernel/service_internal.c (revision 268) @@ -173,4 +173,5 @@ } #else + void unhandleStatus(maps *conf){ int shmid,i; @@ -209,5 +210,5 @@ if ((shmid = shmget(key, SHMSZ, IPC_CREAT | 0666)) < 0) { #ifdef DEBUG - fprintf(stderr,"shmget failed to update value\n"); + fprintf(stderr,"shmget failed to create new Shared memory segment\n"); #endif }else{ @@ -220,6 +221,8 @@ tmpMap=getMapFromMaps(conf,"lenv","status"); s1=shm; - for(s=tmpMap->value;s!=NULL;s++) + for(s=tmpMap->value;*s!=NULL && *s!=0;s++){ *s1++=*s; + } + *s1=NULL; shmdt((void *)shm); } @@ -1722,7 +1725,5 @@ else sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(_tmp->value,"=")+1); - FILE* file=fopen(session_file_path,"w"); - dumpMapsToFile(tmpSess,file); - fclose(file); + dumpMapsToFile(tmpSess,session_file_path); } } Index: branches/branch-1.2/zoo-kernel/service_internal.h =================================================================== --- branches/branch-1.2/zoo-kernel/service_internal.h (revision 220) +++ branches/branch-1.2/zoo-kernel/service_internal.h (revision 268) @@ -57,4 +57,6 @@ #include #include + +#include "cgic.h" extern int getServiceFromFile(const char*,service**); Index: branches/branch-1.2/zoo-kernel/zoo_service_loader.c =================================================================== --- branches/branch-1.2/zoo-kernel/zoo_service_loader.c (revision 220) +++ branches/branch-1.2/zoo-kernel/zoo_service_loader.c (revision 268) @@ -675,5 +675,6 @@ #endif while ((dp = readdir(dirp)) != NULL) - if(strcmp(dp->d_name,buff)==0){ + if((strcasecmp("all.zcfg",buff)==0 && strstr(dp->d_name,".zcfg")>0) + || strcasecmp(dp->d_name,buff)==0){ memset(buff1,0,1024); snprintf(buff1,1024,"%s/%s",conf_dir,dp->d_name); @@ -764,5 +765,5 @@ return 0; } - //close(saved_stdout); + close(saved_stdout); #ifdef DEBUG @@ -1812,9 +1813,14 @@ if(tmpPath==NULL) tmpPath=getMapFromMaps(m,"main","tmpPath"); - sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1); + char *tmp1=strtok(cgiCookie,";"); + if(tmp1!=NULL) + sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1); + else + sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1); + maps *tmpSess=(maps*)calloc(1,MAPS_SIZE); struct stat file_status; int istat = stat(session_file_path, &file_status); - if(istat==0){ + if(istat==0 && file_status.st_size>0){ conf_read(session_file_path,tmpSess); dumpMaps(tmpSess); Index: branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg =================================================================== --- branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg (revision 220) +++ branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg (revision 268) @@ -66,5 +66,5 @@ Abstract = The symmetric difference between the two geometries. - Title = Symmetric Difference + title = Symmetric Difference Index: branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py =================================================================== --- branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (revision 220) +++ branches/branch-1.2/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py (revision 268) @@ -1,26 +1,42 @@ +from osgeo import * import osgeo.ogr +import osgeo.gdal import libxml2 import os import sys -def createGeometryFromWFS(my_wfs_response): - doc=libxml2.parseMemory(my_wfs_response,len(my_wfs_response)) - ctxt = doc.xpathNewContext() - res=ctxt.xpathEval("/*/*/*/*/*[local-name()='Polygon' or local-name()='MultiPolygon' or local-name()='Point' or local-name()='MultiPoint' or local-name()='MultiLineString' or local-name()='LineString' ]") +def createGeometryFromWFS(conf,my_wfs_response): geometry=[] try: - for node in res: - geometry_as_string=node.serialize() - geometry+=[osgeo.ogr.CreateGeometryFromGML(geometry_as_string)] + # Create virtual file or parse XML file depending on the GDAL Version + gV=int(osgeo.gdal.VersionInfo()) + if gV >= 1800: + osgeo.gdal.FileFromMemBuffer('/vsimem//temp', my_wfs_response) + ds = osgeo.ogr.Open('/vsimem//temp') + lyr = ds.GetLayer(0) + feat = lyr.GetNextFeature() + while feat is not None: + geometry+=[feat.GetGeometryRef().Clone()] + feat.Destroy() + feat = lyr.GetNextFeature() + ds.Destroy() + osgeo.gdal.Unlink('/vsimem//temp') + else: + doc=libxml2.parseMemory(my_wfs_response,len(my_wfs_response)) + ctxt = doc.xpathNewContext() + res=ctxt.xpathEval("/*/*/*/*/*[local-name()='Polygon' or local-name()='MultiPolygon' or local-name()='Point' or local-name()='MultiPoint' or local-name()='MultiLineString' or local-name()='LineString' ]") + for node in res: + geometry_as_string=node.serialize() + geometry+=[osgeo.ogr.CreateGeometryFromGML(geometry_as_string)] except: - print >> sys.stderr,"Error" + print >> sys.stderr,"Unable to load file from mem buffer\n\n\n" return geometry -def extractInputs(obj): +def extractInputs(conf,obj): if obj["mimeType"]=="application/json": return [osgeo.ogr.CreateGeometryFromJson(obj["value"])] else: try: - return createGeometryFromWFS(obj["value"]) + return createGeometryFromWFS(conf,obj["value"]) except: return [osgeo.ogr.CreateGeometryFromJson(obj["value"])] @@ -34,5 +50,10 @@ extension = [ ".js" ] drv = osgeo.ogr.GetDriverByName( driverName ) - ds = drv.CreateDataSource( conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0] ) + # Create virtual file or real one depending on the GDAL Version + gV=int(osgeo.gdal.VersionInfo()) + if gV >= 1800: + ds = drv.CreateDataSource( "/vsimem/store"+conf["lenv"]["sid"]+extension[0] ) + else: + ds = drv.CreateDataSource( conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0] ) lyr = ds.CreateLayer( "Result", None, osgeo.ogr.wkbUnknown ) field_defn = osgeo.ogr.FieldDefn( "Name", osgeo.ogr.OFTString ) @@ -49,11 +70,22 @@ i+=1 ds.Destroy() - obj["value"]=open(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0],"r").read() - os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0]) - if len(extension)>1: - os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[1]) + if gV >= 1800: + vsiFile=osgeo.gdal.VSIFOpenL("/vsimem/store"+conf["lenv"]["sid"]+extension[0],"r") + i=0 + while osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_END)>0: + i+=1 + fileSize=osgeo.gdal.VSIFTellL(vsiFile) + osgeo.gdal.VSIFSeekL(vsiFile,0,os.SEEK_SET) + obj["value"]=osgeo.gdal.VSIFReadL(fileSize,1,vsiFile) + osgeo.gdal.Unlink("/vsimem/store"+conf["lenv"]["sid"]+extension[0]) + else: + obj["value"]=open(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0],"r").read() + os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[0]) + if len(extension)>1: + os.unlink(conf["main"]["tmpPath"]+"/store"+conf["lenv"]["sid"]+extension[1]) + def BoundaryPy(conf,inputs,outputs): - geometry=extractInputs(inputs["InputPolygon"]) + geometry=extractInputs(conf,inputs["InputPolygon"]) i=0 rgeometries=[] @@ -66,5 +98,5 @@ def CentroidPy(conf,inputs,outputs): - geometry=extractInputs(inputs["InputPolygon"]) + geometry=extractInputs(conf,inputs["InputPolygon"]) i=0 rgeometries=[] @@ -79,5 +111,5 @@ def ConvexHullPy(conf,inputs,outputs): - geometry=extractInputs(inputs["InputPolygon"]) + geometry=extractInputs(conf,inputs["InputPolygon"]) i=0 rgeometries=[] @@ -94,5 +126,5 @@ except: bdist=10 - geometry=extractInputs(inputs["InputPolygon"]) + geometry=extractInputs(conf,inputs["InputPolygon"]) i=0 rgeometries=[] @@ -106,6 +138,6 @@ def UnionPy(conf,inputs,outputs): - geometry1=extractInputs(inputs["InputEntity1"]) - geometry2=extractInputs(inputs["InputEntity2"]) + geometry1=extractInputs(conf,inputs["InputEntity1"]) + geometry2=extractInputs(conf,inputs["InputEntity2"]) rgeometries=[] i=0 @@ -127,6 +159,6 @@ def IntersectionPy(conf,inputs,outputs): - geometry1=extractInputs(inputs["InputEntity1"]) - geometry2=extractInputs(inputs["InputEntity2"]) + geometry1=extractInputs(conf,inputs["InputEntity1"]) + geometry2=extractInputs(conf,inputs["InputEntity2"]) rgeometries=[] i=0 @@ -148,6 +180,6 @@ def DifferencePy(conf,inputs,outputs): - geometry1=extractInputs(inputs["InputEntity1"]) - geometry2=extractInputs(inputs["InputEntity2"]) + geometry1=extractInputs(conf,inputs["InputEntity1"]) + geometry2=extractInputs(conf,inputs["InputEntity2"]) rgeometries=[] i=0 @@ -169,6 +201,6 @@ def SymDifferencePy(conf,inputs,outputs): - geometry1=extractInputs(inputs["InputEntity1"]) - geometry2=extractInputs(inputs["InputEntity2"]) + geometry1=extractInputs(conf,inputs["InputEntity1"]) + geometry2=extractInputs(conf,inputs["InputEntity2"]) rgeometries=[] i=0 Index: branches/branch-1.2/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg =================================================================== --- branches/branch-1.2/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg (revision 220) +++ branches/branch-1.2/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg (revision 268) @@ -8,5 +8,5 @@ serviceProvider = ogr2ogr_service.zo - Title = My Demo + title = My Demo Index: branches/branch-1.2/zoo-services/ogr/ogr2ogr/service.c =================================================================== --- branches/branch-1.2/zoo-services/ogr/ogr2ogr/service.c (revision 220) +++ branches/branch-1.2/zoo-services/ogr/ogr2ogr/service.c (revision 268) @@ -95,5 +95,5 @@ const char *pszSQLStatement = NULL; int eGType = -2; - double dfMaxSegmentLength = 0; + double dfMaxSegmentLength = 0; /* Check strict compilation and runtime library version as we use C++ API */ @@ -178,10 +178,7 @@ } - tmpMap=NULL; - tmpMap=getMapFromMaps(inputs,"overwrite","value"); - if(tmpMap!=NULL){ - bOverwrite = TRUE; - } - + /* if exist, overwrite the data with the same name */ + bOverwrite = TRUE; + tmpMap=NULL; tmpMap=getMapFromMaps(inputs,"update","value"); @@ -826,9 +823,5 @@ #ifdef ZOO_SERVICE - outputs=(maps*)malloc(sizeof(maps*)); - outputs->name="GeneratedFile"; outputs->content=createMap("value",(char*)pszwebDestData); - addMapToMap(&outputs->content,createMap("dataType","string")); - outputs->next=NULL; return SERVICE_SUCCEEDED; #else Index: branches/branch-1.2/zoo-services/openoffice/cgi-env/Xml2Pdf.zcfg =================================================================== --- branches/branch-1.2/zoo-services/openoffice/cgi-env/Xml2Pdf.zcfg (revision 268) +++ branches/branch-1.2/zoo-services/openoffice/cgi-env/Xml2Pdf.zcfg (revision 268) @@ -0,0 +1,39 @@ +[Xml2Pdf] + Title = Convert raster data from one format to another. + Abstract = Converts raster data between different formats. + processVersion = 1 + storeSupported = true + statusSupported = true + serviceType = Python + serviceProvider = oo_service + + [doc] + Title = The input Open Document Text + Abstract = The input Open Document Text including all required Styles + minOccurs = 1 + maxOccurs = 1 + + dataType = string + + + [xml] + Title = The input XML file + Abstract = The input XML file to convert. + minOccurs = 1 + maxOccurs = 1 + + dataType = string + + + + + [Document] + Title = The resulting file + Abstract = The file content resulting of the convertion from XML to PDF + + + mimeType=application/pdf + extension=pdf + + + Index: branches/branch-1.2/zoo-services/openoffice/cgi-env/oo_service.py =================================================================== --- branches/branch-1.2/zoo-services/openoffice/cgi-env/oo_service.py (revision 268) +++ branches/branch-1.2/zoo-services/openoffice/cgi-env/oo_service.py (revision 268) @@ -0,0 +1,120 @@ +import uno +import getopt, sys, os + +from unohelper import Base, systemPathToFileUrl, absolutize + +from com.sun.star.beans import PropertyValue +from com.sun.star.script import CannotConvertException +from com.sun.star.lang import IllegalArgumentException +from com.sun.star.task import ErrorCodeIOException +from com.sun.star.io import IOException, XOutputStream +from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER +from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK + +from xml.dom import minidom +import sys + +keep_trace='' + +def addToText(cursor,text,level,value): + if level==1: + cursor.NumberingStyleName = "NONE" + cursor.ParaStyleName="Heading 1" + text.insertString( cursor, value , 0 ) + text.insertControlCharacter( cursor, PARAGRAPH_BREAK , 0 ) + #print >> sys.stderr,' * Main Title : ' + value + else: + i=0 + prefix='' + while i < level-1: + prefix+=' ' + i+=1 + cursor.NumberingStyleName="List "+str(level-1) + text.insertString( cursor, prefix+value , 0 ) + text.insertControlCharacter( cursor, PARAGRAPH_BREAK , 0 ) + cursor.NumberingStyleName = "NONE" + #print >> sys.stderr,dir(sys.stderr) + #print >> sys.stderr,prefix+' * NumberingStyleName '+str(level-1)+' '+value.encode('iso-8859-15') + +def printChildren(cursor,text,node,level,keep_trace): + if node.nodeType==3: + level-=1 + + if not(node.nodeValue!=None and len(node.nodeValue.replace(' ',''))!=1 and keep_trace!='' and keep_trace!=None): + if keep_trace!='': + addToText(cursor,text,level-1,keep_trace) + keep_trace=node.nodeName + + if node.hasChildNodes(): + for i in node.childNodes: + printChildren(cursor,text,i,level+1,keep_trace) + keep_trace='' + else: + if node.nodeValue != None and len(node.nodeValue.replace(' ',''))>1: + addToText(cursor,text,level-1,keep_trace+' : '+node.nodeValue) + keep_trace='' + else: + if node.nodeValue != None and len(node.nodeValue.replace(' ',''))>1: + addToText(cursor,text,level-1,keep_trace+' : '+node.nodeValue) + keep_trace='' + else: + if keep_trace!='#text': + addToText(cursor,text,level-1,keep_trace) + keep_trace='' + + if node.nodeType==1 and node.hasAttributes(): + i=0 + while i> sys.stderr,' * 1st level' + i.nodeName + if i.hasChildNodes(): + for j in i.childNodes: + printChildren(cursor,text,j,2,'') + + tmp=myDocument.StyleFamilies.getByName("NumberingStyles") + + tmp1=tmp.getByName("Puce 1") + + prop1Fich = ( PropertyValue( "FilterName" , 0, "writer_pdf_Export", 0 ),PropertyValue( "Overwrite" , 0, True , 0 ) ) + outputDoc=systemPathToFileUrl("/tmp/output.pdf") + myDocument.storeToURL(outputDoc,prop1Fich) + + myDocument.close(True) + ctx.ServiceManager + output["Document"]["value"]= open('/tmp/output.pdf', 'r').read() + print >> sys.stderr,len(output["Document"]["value"]) + return 3 + +#To run test from command line uncomment the following line: +#xml2pdf({},{"file":{"value":"/tmp/demo.xml"},"doc":{"value":"/tmp/demo.odt"}},{}) Index: branches/branch-1.2/zoo-services/utils/status/Makefile =================================================================== --- branches/branch-1.2/zoo-services/utils/status/Makefile (revision 220) +++ branches/branch-1.2/zoo-services/utils/status/Makefile (revision 268) @@ -1,3 +1,3 @@ -CFLAGS=-I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG +CFLAGS=-I../../../thirds/cgic206/ -I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -lintl -lfcgi -lcrypto -DLINUX_FREE_ISSUE #-DDEBUG # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have # uncomment the following line Index: branches/branch-1.2/zoo-services/utils/status/service.c =================================================================== --- branches/branch-1.2/zoo-services/utils/status/service.c (revision 220) +++ branches/branch-1.2/zoo-services/utils/status/service.c (revision 268) @@ -72,9 +72,13 @@ char tmp[128]; sprintf(tmp,"_%s.xml",tmpMap->value); - while ((dp = readdir(dirp)) != NULL) + while ((dp = readdir(dirp)) != NULL){ +#ifdef DEBUG + fprintf(stderr,"File : %s searched : %s\n",dp->d_name,tmp); +#endif if(strstr(dp->d_name,tmp)!=0){ sprintf(fileName,"%s/%s",tmpTmap->value,dp->d_name); hasFile=1; } + } }else{ char tmp[1024]; Index: branches/branch-1.2/zoo-services/utils/status/test.sh =================================================================== --- branches/branch-1.2/zoo-services/utils/status/test.sh (revision 268) +++ branches/branch-1.2/zoo-services/utils/status/test.sh (revision 268) @@ -0,0 +1,19 @@ +#!/bin/bash + +rm -f log log1 + +./zoo_loader.cgi "request=Execute&service=WPS&version=1.0.0&Identifier=longProcess&DataInputs=&storeExecuteResponse=true&status=true" > log + +if [ -z "$(grep "ows:ExceptionReport" log)" ]; then + while [ -z "$(grep "wps:ProcessSucceeded" log1)" ]; + do + ./zoo_loader.cgi $(grep statusLocation= ./log | cut -d'?' -f2 | cut -d'"' -f1 | sed "s:amp;::g") > log1 ; + cat log1 ; + done + cat log1 +else + echo "Service failed, please make sure that your main.cfg file contains" + echo "in the [main] section valid values for both tmpPath and dataPath." + echo + cat log +fi