diff --git a/ChangeLog b/ChangeLog index ed892227bd..3ea271d3c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,430 @@ +2024-06-10 Patrick van Kleef + + Updated version to 7.2.13 + + Merge branch 'feature/vos-fixes' into develop/7 + + Updated version to 7.2.13-rc + + Updated Changelog + + Updated NEWS.md + +2024-06-07 Patrick van Kleef + + Updated version to 7.2.13 engine 3240 + +2024-06-07 Mitko Iliev + + Fixed issue reading large chunked data in SSE client + +2024-06-07 Patrick van Kleef + + Updated Conductor VAD version + +2024-06-07 Mitko Iliev + + Fixed missing check for optional table + + Fixed issue when initialization of snapshot fails + + Fixed issue with wrong vad file path during vad install + + Fixed save CORs via WS wizard duplicate cors options + +2024-06-06 Mitko Iliev + + Fixed preserve qualifier when updating trigger + +2024-06-06 Patrick van Kleef + + Updated copyright + +2024-06-04 Patrick van Kleef + + Fixed use virtuoso_ini_item_value where appropriate + +2024-06-04 Mitko Iliev + + Fixed issue calculating hash when target graph is null + +2024-05-23 Patrick van Kleef + + Fixed warning of invalid escape sequence + +2024-05-07 Patrick van Kleef + + Fixed typo and small cleanups + +2024-05-07 Mitko Iliev + + Fixed missing checks for service and query arguments + +2024-05-07 Patrick van Kleef + + Fixed issue with stack var clobbered by setjump/longjump + +2024-05-07 Mitko Iliev + + Fixed MD5 context should be kept on connection global and not reused + + This fixes #1287 + +2024-05-07 Patrick van Kleef + + Merge branch 'feature/fuzzer-fixes' into develop/7 + +2024-05-07 Mitko Iliev + + Added testsuite entries for recently fixed issues + +2024-05-07 Patrick van Kleef + + Fixed use vsnprintf + +2024-05-07 Mitko Iliev + + Fixed various missing BIF functions argument checks + + This closes #1286, closes #1288, closes #1289, closes #1290, closes #1291, + closes #1292, closes #1293, closes #1294, closes #1295 + +2024-05-02 Patrick van Kleef + + Fixed compiler warning + + Added new test + +2024-05-02 Mitko Iliev + + Backport from v8 + + For string buffers, round to next large size, see that there is 16 bytes + of margin after the last for sse string ops so no ref to unmapped at + end of strings + +2024-05-02 Mitko Iliev + + Fixed issue with hash in group by (fixes #1285) + +2024-05-02 Patrick van Kleef + + Fixed length calculation in REPEAT (fixes #1282) + +2024-05-01 Patrick van Kleef + + Merge branch 'feature/fuzzer-fixes' into develop/7 + +2024-04-30 Mitko Iliev + + Added new tests for recent cases + + Fixed missing copy of parameter value (fixes #1284) + + Fixed missing sz check (fixes #1283) + + Fixed make sure position is 1-based + + Fixed offset overflow (fixes #1281) + + Fixed issue trying to normalize an invalid numeric (fixes #1279) + +2024-04-29 Patrick van Kleef + + Merge branch 'feature/2024_04_29_fix_jena3_4' into develop/7 + + Rebuild Jena 3/4 providers + +2024-04-29 Sergey Malinin + + Fixed missing properties during initialization of a new Model + + VirtDataSet methods getDefaultModel()/getNamedModel() doesn't apply all + properties(like queryTimeout and etc) to the newly created Model + +2024-04-09 Mitko Iliev + + Fixed vec input should be declared as boxed i.e. array (Fixes #1254) + +2024-04-04 Mitko Iliev + + Fixed unfolded bifs have to have serial to distinguish separate calls (fixes #1276) + +2024-04-02 Mitko Iliev + + Fixed issue with transaction boundary + + Fixed memory leak + +2024-03-28 Patrick van Kleef + + Upgraded sparql_demo build process to use vadpacker + + Removed deprecated script + + Upgraded bpel build process to use vadpacker + +2024-03-26 Patrick van Kleef + + Fixed missing condition for sponger settings + +2024-03-25 Patrick van Kleef + + Disabled unused filesystem vad packages + + Updated DBpedia VAD version + + Fixed encoding + +2024-03-25 Patrick van Kleef + + Added new prefixes + + gold: + ov: + +2024-03-25 Patrick van Kleef + + Fixed set default for dbp_decode_iri to ON + + Added initial support for /datatype + +2024-03-25 Patrick van Kleef + + Fixed installation scripts to remove need for dbpedia_init.sql + + The dbpedia_pl.sql now contains the relevant PL code from + dbpedia_init.sql. + + The dbpedia_del.sql removes all the old and sometimes confusing rewrite + rules etc., that added an unnecessary layer of complexety. + + Moved the /void rules and vdirs to dbpedia_local.sql. + +2024-03-25 Patrick van Kleef + + Upgraded DBpedia build process to use vadpacker + + Upgraded iSPARQL build process to use vadpacker + + Upgraded Conductor build process to use vadpacker + + Upgraded RDB2RDF build process to use vadpacker + + Small cleanup for FCT vad building + + Upgraded to vadpacker v1.8 + +2024-03-25 Mitko Iliev + + Fixed issue with MaxMemPoolSize + + Allow MaxMemPoolSize to be 0 (unlimited) or from 400M (default) + to INT64_MAX + +2024-03-25 Mitko Iliev + + Fixed issue freeing n-way nic arrays + + The n-way nic arrays are allocated a bin box, should free as such. + +2024-03-22 Patrick van Kleef + + Fixed 'Read/Write wait on column page...' should be debug messages + + Merge branch 'feature/fuzzer-fixes' into develop/7 + +2024-03-22 Mitko Iliev + + Fixed geometry objects must be represented as strings (Fixes #1274) + + Added new tests for recent cases + + Fixed 64bit arith overflow (Fixes #1270) + + Fixed missing check for star (Fixes #1269) + + Fixed set dc type on grouping sets (Fixed #1268) + + Fixed check num cols in union branches when subq non-terminal is used (Fixes #1267) + + Fixed check for control exp over non-terminal not-allowed/can't be handled (Fixes #1266) + + Fixed ft exp & similar not allowed in control exp (Fixes #1265) + + Fixed negative column offset (Fixes #1264) + + Fixed test for comma exp not allowed in arith exp (Fixes #1263) + + Fixed cost on void geo function (Fixes #1262) + + Fixed memcopy buffer overflow (Fixes #1259) + +2024-03-22 Mitko Iliev + + Added stack overflow ck (Fixes #1258) + + Also resolves #1271, resolves #1272 + +2024-03-22 Mitko Iliev + + Fixed alloc double dep on demand as as int (Fixes #1257) + + Fixed ambiguous subq return (Fixes #1253) + +2024-03-20 Mitko Iliev + + Fixed issue with non-string copy (Fixes #1252) + + Fixed non iri_id and non such as iri should be error + + Added cumulative patch for cube/rollup and bad dt artithmetics + + Added new tests for recent cases + + Fixed missing check for const in predicate (fixed #1251) + +2024-03-15 Mitko Iliev + + Added new tests for recent cases + + Fixed const in predicate can be removed by optimiser (fixed #1250) + +2024-03-14 Mitko Iliev + + Added test for vec param cast any/str/null + + Fixed issue on any ssl w/h nulls (fixes #1249) + +2024-03-12 Patrick van Kleef + + Fixed issues with clang 15 and newer compilers + + Clang now throws an error on several constructions that previously + only returned a warning, such as: + + * incompatible function pointer types + * incompatible integer to pointer conversion + + This causes problems when building on the latest macOS XCode release as + well as the upcoming new Ubuntu 24.04 + +2024-03-11 Mitko Iliev + + Fixed TSV output to use SPARQL 1.1 TSV specification + + See: https://www.w3.org/TR/2013/REC-sparql11-results-csv-tsv-20130321/#tsv-table + +2024-03-08 Patrick van Kleef + + Removed unused argument artifact + + Fixed issues reported by link time optimizer (LTO) + +2024-03-04 Patrick van Kleef + + Merge branch 'feature/vos-fixes' into develop/7 + + Added missing tsuite entries + + Updated Conductor VAD version + +2024-03-04 Tim Haynes + + Conductor: Inclusion.Engine Sites: constrain site-name field to non-space characters only + +2024-03-04 Mitko Iliev + + Fixed issue with join and order by on null result (fixes #1241) + + Keep set control node together with outer sequence end node in both + left and right outer join + +2024-03-04 Mitko Iliev + + Merged back safe logical_* bif names from v8 + + Fixed issue importing bad IRI pattern + + Fixed issues with microdata parser + + Fixed debug printf only in DEBUG modeF + + Added optional alternative names for server X.509 certificate + + Fixed issue getting client status during swapping or www maintenance + + Fixed issue collecting ft stats during checkpoint + +2024-02-29 Patrick van Kleef + + Updated FCT vad version + + Removed deprecated scripts + + Fixed namespace of inference rules graphs + + Fixed check for python executable + + Upgraded FCT build process to use vadpacker + + Added vadpacker tool + +2024-02-20 Mitko Iliev + + Fixed issue on rehash if dict_put is used in select list + +2024-02-15 Patrick van Kleef + + Fixed issue with basename on older machines + + Fixed allow building against openssl 3.2.x + +2024-02-15 Patrick van Kleef + + Fixed small issues with sql_to_c.awk script (fixes #1244) + + * Added version to header + * Fixed include lines + * Fixed warnings on unknown regexp operator + * Updated documentation that GNU awk versions 3.11 up to and including + 5.3.0 have been validated + +2024-02-15 Patrick van Kleef + + Fixed issue with bad index op ref in table dft (fixes #1245) + + Moved check for dio_terms into the correct block. + + This fixes an issue introduced by commit + fb0cf1cdd1ec20e226d8f0eb41710eaf8093437b + +2024-02-14 Sergey Malinin + + Fixed issue building Windows binaries + +2024-02-14 Patrick van Kleef + + Updated version to 7.2.13-dev to mark the start of a new development cycle + 2024-02-13 Patrick van Kleef + Merge tag 'v7.2.12' into develop/7 + + Tagged for release + +2024-02-13 Patrick van Kleef + + Merge branch 'release/7.2.12' into stable/7 + Updated ChangeLog Updated version to 7.2.12 engine 3239 Updated NEWS.md + Updated NEWS.md + Fixed portability issues Updated version to 7.2.12-rc2 diff --git a/NEWS.md b/NEWS.md index b79e8ebd9d..d0dee9f008 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,83 @@ # NEWS +## June 10, 2024, v7.2.13: + * Virtuoso Engine + - Added safe logical_* bif names + - Fixed issues with clang 15 and newer compilers + - Fixed issues reported by link time optimizer (LTO) + - Fixed 'Read/Write wait on column page...' should be debug messages + - Fixed various missing BIF functions argument checks + - Fixed issue with cube/rollup + - Fixed issue with bad date/time artithmetics + - Fixed issue getting client status during swapping or www maintenance + - Fixed issue collecting freetext stats during checkpoint + - Fixed issue on rehash if `dict_put` is used in select list + - Fixed issue with MaxMemPoolSize + - Fixed put MD5 context on connection global (fixes #1287) + - Fixed issue with hash in group by (fixes #1285) + - Fixed missing sz check (fixes #1283) + - Fixed length calculation in REPEAT (fixes #1282) + - Fixed offset overflow (fixes #1281) + - Fixed issue trying to normalize an invalid numeric (fixes #1279) + - Fixed unfolded bifs have to have serial to distinguish separate calls (fixes #1276) + - Fixed 64bit arith overflow (fixes #1270) + - Fixed missing check for star (fixes #1269) + - Fixed set dc type on grouping sets (Fixed #1268) + - Fixed check num cols in union branches when subq non-terminal is used (fixes #1267) + - Fixed check for control exp over non-terminal not-allowed/can't be handled (fixes #1266) + - Fixed ft exp & similar not allowed in control exp (fixes #1265) + - Fixed negative column offset (fixes #1264) + - Fixed test for comma exp not allowed in arith exp (fixes #1263) + - Fixed cost on void geo function (fixes #1262) + - Fixed memcopy buffer overflow (fixes #1259) + - Fixed missing stack overflow check (fixes #1258) + - Fixed alloc double dep on demand as as int (fixes #1257) + - Fixed vec input should be declared as boxed i.e. array (fixes #1254) + - Fixed ambiguous subq return (fixes #1253) + - Fixed issue with non-string copy (fixes #1252) + - Fixed missing check for const in predicate (fixed #1251) + - Fixed const in predicate can be removed by optimiser (fixed #1250) + - Fixed issue on any ssl w/h nulls (fixes #1249) + - Fixed issue with bad index op ref in table dft (fixes #1245) + - Fixed small issues with `sql_to_c.awk` script (fixes #1244) + - Fixed issue with join and order by on null result (fixes #1241) + - Fixed issue freeing n-way nic arrays + - Fixed issue building Windows binaries + - Fixed memory leak + + * SPARQL + - Fixed missing checks for service and query arguments + - Fixed TSV output to use SPARQL 1.1 TSV specification + - Fixed issue importing bad IRI pattern + - Fixed issues with microdata parser + - Fixed geometry objects must be represented as strings (fixes #1274) + + * Web Server and DAV + - Fixed issue reading large chunked data in SSE client + - Fixed issue with transaction boundary in DAV + - Fixed issue with stack var clobbered by setjump/longjump + + * Faceted Browser + - Upgraded FCT build process to use vadpacker + - Fixed namespace of inference rules graphs + - Removed deprecated scripts + + * Conductor + - Upgraded Conductor build process to use vadpacker + - Added optional alternative names for server X.509 certificate + - Fixed missing check for optional table + - Fixed issue when initialization of snapshot fails + - Fixed issue with wrong vad file path during vad install + - Fixed save CORs via WS wizard duplicate cors options + - Fixed preserve qualifier when updating trigger + - Fixed missing condition for sponger settings + - Fixed constrain site-name field to non-space characters only + + * R2RML + - Upgraded RDB2RDF build process to use vadpacker + - Fixed issue calculating hash when target graph is null + + ## February 13, 2024, v7.2.12: * Virtuoso Engine @@ -62,10 +140,10 @@ - Fixed `virtrdf:Geometry` should be replaced with wktLiteral (fixes #806) * Web Server and DAV - - Added HTTP CORS pattern support + - Added HTTP CORs pattern support - Added support to avoid redundant check for 401 handlers - Added support for Azure Storage Account as a DET mounting option - - Added support for Access-Control-Allow-Methods different than Allow, for AJAX CORS + - Added support for Access-Control-Allow-Methods different than Allow, for AJAX CORs - Added `security_realm` to access realm from VD - Added support for ping/pong for websock - Added support for binary frames in websocket diff --git a/README.GIT.md b/README.GIT.md index 2da063a894..06716eac76 100644 --- a/README.GIT.md +++ b/README.GIT.md @@ -82,10 +82,10 @@ installed on your system. | flex | 2.5.33 | 2.6.4 | http://flex.sourceforge.net/ | | bison | 2.3 | 3.5.1 | http://www.gnu.org/software/bison/ | | gperf | 3.0.1 | 3.1 | http://www.gnu.org/software/gperf/ | -| gawk | 3.1.1 | 5.0.1 | http://www.gnu.org/software/gawk/ | +| gawk | 3.1.1 | 5.3.0 | http://www.gnu.org/software/gawk/ | | m4 | 1.4.1 | 1.4.18 | http://www.gnu.org/software/m4/ | | make | 3.79.1 | 4.2.1 | http://www.gnu.org/software/make/ | -| OpenSSL | 0.9.8e | 3.1.x | http://www.openssl.org/ | +| OpenSSL | 0.9.8e | 3.2.x | http://www.openssl.org/ | and any GNU packages required by these. The autogen.sh and configure scripts check for the presence and right version of some of the required diff --git a/README.md b/README.md index 453e7f20ea..bf5da22fde 100644 --- a/README.md +++ b/README.md @@ -54,10 +54,10 @@ installed on your system. | flex | 2.5.33 | 2.6.4 | http://flex.sourceforge.net/ | | bison | 2.3 | 3.5.1 | http://www.gnu.org/software/bison/ | | gperf | 3.0.1 | 3.1 | http://www.gnu.org/software/gperf/ | -| gawk | 3.1.1 | 5.0.1 | http://www.gnu.org/software/gawk/ | +| gawk | 3.1.1 | 5.3.0 | http://www.gnu.org/software/gawk/ | | m4 | 1.4.1 | 1.4.18 | http://www.gnu.org/software/m4/ | | make | 3.79.1 | 4.2.1 | http://www.gnu.org/software/make/ | -| OpenSSL | 0.9.8e | 3.1.x | http://www.openssl.org/ | +| OpenSSL | 0.9.8e | 3.2.x | http://www.openssl.org/ | and any GNU packages required by these. The autogen.sh and configure scripts check for the presence and right version of some of the required diff --git a/appsrc/ODS-Addressbook/Makefile.am b/appsrc/ODS-Addressbook/Makefile.am index 1eab645336..16de0c4b3f 100644 --- a/appsrc/ODS-Addressbook/Makefile.am +++ b/appsrc/ODS-Addressbook/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_addressbook_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Addressbook/make_vad.sh b/appsrc/ODS-Addressbook/make_vad.sh index 503037a86d..d898f371e2 100755 --- a/appsrc/ODS-Addressbook/make_vad.sh +++ b/appsrc/ODS-Addressbook/make_vad.sh @@ -28,7 +28,7 @@ LANG=C LC_ALL=POSIX export LANG LC_ALL -MODE=$1 +MODE=${1:-1} LOGDIR=`pwd` VERSION="1.0.0" LOGFILE="${LOGDIR}/vad_make.log" diff --git a/appsrc/ODS-Blog/Makefile.am b/appsrc/ODS-Blog/Makefile.am index 5c5f9eedeb..0bf30945ec 100644 --- a/appsrc/ODS-Blog/Makefile.am +++ b/appsrc/ODS-Blog/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_blog_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Bookmark/Makefile.am b/appsrc/ODS-Bookmark/Makefile.am index 662ea8306b..44b913ec1e 100644 --- a/appsrc/ODS-Bookmark/Makefile.am +++ b/appsrc/ODS-Bookmark/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_bookmark_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Briefcase/Makefile.am b/appsrc/ODS-Briefcase/Makefile.am index 6b653efc4a..f29bf32eb9 100644 --- a/appsrc/ODS-Briefcase/Makefile.am +++ b/appsrc/ODS-Briefcase/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_briefcase_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Calendar/Makefile.am b/appsrc/ODS-Calendar/Makefile.am index bf42c66bc9..814c1f0f9c 100644 --- a/appsrc/ODS-Calendar/Makefile.am +++ b/appsrc/ODS-Calendar/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_calendar_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Community/Makefile.am b/appsrc/ODS-Community/Makefile.am index a8c2b71421..fae0ed0595 100644 --- a/appsrc/ODS-Community/Makefile.am +++ b/appsrc/ODS-Community/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_community_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Discussion/Makefile.am b/appsrc/ODS-Discussion/Makefile.am index b9b4fdc8fe..66215ba79a 100644 --- a/appsrc/ODS-Discussion/Makefile.am +++ b/appsrc/ODS-Discussion/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ vad.trx ods_discussion_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-FeedManager/Makefile.am b/appsrc/ODS-FeedManager/Makefile.am index 22e0426a8d..bacce3799a 100644 --- a/appsrc/ODS-FeedManager/Makefile.am +++ b/appsrc/ODS-FeedManager/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_feedmanager_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Framework/Makefile.am b/appsrc/ODS-Framework/Makefile.am index a3bbb02905..8c4ff9e81c 100644 --- a/appsrc/ODS-Framework/Makefile.am +++ b/appsrc/ODS-Framework/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_framework_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Gallery/Makefile.am b/appsrc/ODS-Gallery/Makefile.am index 8efb1a1c0f..9addcbff99 100644 --- a/appsrc/ODS-Gallery/Makefile.am +++ b/appsrc/ODS-Gallery/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_gallery_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Polls/Makefile.am b/appsrc/ODS-Polls/Makefile.am index e39166f9ea..77cba247c4 100644 --- a/appsrc/ODS-Polls/Makefile.am +++ b/appsrc/ODS-Polls/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = \ virtuoso.trx ods_polls_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-WebMail/Makefile.am b/appsrc/ODS-WebMail/Makefile.am index 4084dd021e..fb712b0e23 100644 --- a/appsrc/ODS-WebMail/Makefile.am +++ b/appsrc/ODS-WebMail/Makefile.am @@ -36,7 +36,7 @@ CLEANFILES = \ virtuoso.trx ods_webmail_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/appsrc/ODS-Wiki/Makefile.am b/appsrc/ODS-Wiki/Makefile.am index 776cca1c38..4459ea3261 100644 --- a/appsrc/ODS-Wiki/Makefile.am +++ b/appsrc/ODS-Wiki/Makefile.am @@ -43,7 +43,7 @@ CLEANFILES = \ virtuoso.trx ods_wiki_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh + PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost sh ./make_vad.sh 1 clean-local: -rm -rf vad diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am index 898b534936..dbfc2bd6ff 100644 --- a/binsrc/Makefile.am +++ b/binsrc/Makefile.am @@ -19,7 +19,7 @@ # # -SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j rdf4j_4 websocket +SUBDIRS = vadpacker dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting graphql bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 jena4 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j rdf4j_4 websocket # ---------------------------------------------------------------------- diff --git a/binsrc/bpel/Makefile.am b/binsrc/bpel/Makefile.am index 750c59f556..c6a98bd82a 100644 --- a/binsrc/bpel/Makefile.am +++ b/binsrc/bpel/Makefile.am @@ -25,8 +25,35 @@ if WITH_BPEL_VAD nodist_vad_DATA = bpel_dav.vad endif -BUILD_FILES = bpel_dav.vad bpel_filesystem.vad +BUILD_FILES = bpel_dav.vad + +NEED_VERSION = 07.20.3226 +STICKER = bpel_sticker.xml +VERBOSE = #--verbose +VERSION = `cat vad_version` + +DAV_FLAGS = $(VERBOSE) \ + --prefix "." \ + --var="BASE_PATH=/DAV/VAD" \ + --var="ISDAV=1" \ + --var="NEED_VERSION=$(NEED_VERSION)" \ + --var="TYPE=dav" \ + --var="VERSION=$(VERSION)" + +bpel_dav.vad: $(EXTRA_DIST) Makefile + $(PYTHON) $(top_srcdir)/binsrc/vadpacker/vadpacker.py \ + -o $(builddir)/bpel_dav.vad \ + $(DAV_FLAGS) \ + $(srcdir)/$(STICKER) + + +# ---------------------------------------------------------------------- +# +# Cleanup +# +# ---------------------------------------------------------------------- CLEANFILES = \ + *.log \ vad.db \ vad.log \ vad.trx \ @@ -42,9 +69,6 @@ CLEANFILES = \ bpel_dav.vad \ bpel_filesystem.vad -bpel_dav.vad bpel_filesystem.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost $(SHELL) ./make_vad.sh - clean-local: -rm -rf vad @@ -54,218 +78,216 @@ clean-local: # # ---------------------------------------------------------------------- EXTRA_DIST = \ - *.css \ - *.gif \ - *.jpg \ - *.sql \ - *.txt \ - *.vsp \ - *.vspx \ - *.xsl \ - 101.HelloWorld/*.bpel \ - 101.HelloWorld/*.wsdl \ - 101.HelloWorld/*.xml \ - 106.ParallelFlows/*.bpel \ - 106.ParallelFlows/*.wsdl \ - 106.ParallelFlows/*.xml \ - 109.CorrelationSets/*.wsdl \ - 109.CorrelationSets/*.xml \ - 109.CorrelationSets/Buyer/*.bpel \ - 109.CorrelationSets/Buyer/*.wsdl \ - 109.CorrelationSets/Buyer/*.xml \ - 109.CorrelationSets/Buyer/.project \ - 109.CorrelationSets/Seller/*.bpel \ - 109.CorrelationSets/Seller/*.wsdl \ - 109.CorrelationSets/Seller/*.xml \ - 109.CorrelationSets/Seller/.project \ - bpel.xsd \ - bpelv.xsd \ - bpelx.xsd \ - bpel_adaptor.cs \ - help/*.xml \ - i/*.gif \ - i/*.jpg \ - i/*.png \ - i/Thumbs.db \ - make_vad.sh \ - system/bpel/bpel.xsd \ - tests/*.vsp \ - tests/*.xml \ - tests/bpel_engines/activeBPEL/*.txt \ - tests/bpel_engines/Twister/*.txt \ - tests/bpel_engines/Twister/*.xml \ - tests/echo/*.bpel \ - tests/echo/*.sql \ - tests/echo/*.vsp \ - tests/echo/*.wsdl \ - tests/echo/*.xml \ - tests/echo/ini.sh \ - tests/echovirt/*.bpel \ - tests/echovirt/*.sql \ - tests/echovirt/*.wsdl \ - tests/echovirt/*.xml \ - tests/fault1/*.bpel \ - tests/fault1/*.sql \ - tests/fault1/*.vsp \ - tests/fault1/*.wsdl \ - tests/fault1/*.xml \ - tests/fi/*.bpel \ - tests/fi/*.sql \ - tests/fi/*.vsp \ - tests/fi/*.wsdl \ - tests/fi/*.xml \ - tests/Flow/*.bpel \ - tests/Flow/*.sql \ - tests/Flow/*.wsdl \ - tests/Flow/*.xml \ - tests/interop/site/*.html \ - tests/interop/site/*.sql \ - tests/interop/site/Aecho/*.bpel \ - tests/interop/site/Aecho/*.sql \ - tests/interop/site/Aecho/*.wsdl \ - tests/interop/site/Aecho/*.xml \ - tests/interop/site/bpel4ws/*.css \ - tests/interop/site/bpel4ws/*.gif \ - tests/interop/site/bpel4ws/*.jpg \ - tests/interop/site/bpel4ws/*.png \ - tests/interop/site/bpel4ws/*.sql \ - tests/interop/site/bpel4ws/*.vsp \ - tests/interop/site/bpel4ws/*.vspx \ - tests/interop/site/bpel4ws/*.xml \ - tests/interop/site/bpel4ws/*.xsl \ - tests/interop/site/bpel4ws/clients/*.vspx \ - tests/interop/site/bpel4ws/clients/*.xsl \ - tests/interop/site/echo/*.bpel \ - tests/interop/site/echo/*.sql \ - tests/interop/site/echo/*.wsdl \ - tests/interop/site/echo/*.xml \ - tests/interop/site/RMecho/*.bpel \ - tests/interop/site/RMecho/*.sql \ - tests/interop/site/RMecho/*.wsdl \ - tests/interop/site/RMecho/*.xml \ - tests/interop/site/RMLoan/*.bpel \ - tests/interop/site/RMLoan/*.sql \ - tests/interop/site/RMLoan/*.vsp \ - tests/interop/site/RMLoan/*.wsdl \ - tests/interop/site/RMLoan/*.xml \ - tests/interop/site/SecAecho/*.bpel \ - tests/interop/site/SecAecho/*.sql \ - tests/interop/site/SecAecho/*.wsdl \ - tests/interop/site/SecAecho/*.xml \ - tests/interop/site/SecLoan/*.bpel \ - tests/interop/site/SecLoan/*.sql \ - tests/interop/site/SecLoan/*.vsp \ - tests/interop/site/SecLoan/*.wsdl \ - tests/interop/site/SecLoan/*.xml \ - tests/interop/site/SecLoan/ClientPrivate.pfx \ - tests/interop/site/SecLoan/ClientPublic.cer \ - tests/interop/site/SecLoan/ServerPrivate.pfx \ - tests/interop/site/SecLoan/ServerPublic.cer \ - tests/interop/site/SecRMLoan/*.bpel \ - tests/interop/site/SecRMLoan/*.sql \ - tests/interop/site/SecRMLoan/*.vsp \ - tests/interop/site/SecRMLoan/*.wsdl \ - tests/interop/site/SecRMLoan/*.xml \ - tests/interop/UseCases/*.bpel \ - tests/interop/UseCases/*.sql \ - tests/interop/UseCases/*.vsp \ - tests/interop/UseCases/*.wsdl \ - tests/interop/UseCases/*.xml \ - tests/interop/WSE2.0/*.bpel \ - tests/interop/WSE2.0/*.sql \ - tests/interop/WSE2.0/*.wsdl \ - tests/interop/WSE2.0/README \ - tests/interop/WSE2.0/SecClient/Makefile \ - tests/interop/WSE2.0/SecClient/SecClient.cs \ - tests/interop/WSE2.0/SecClient/SecClient.exe.config \ - tests/interop/WSE2.0/SecSvc/Makefile \ - tests/interop/WSE2.0/SecSvc/SecSvc.asmx \ - tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs \ - tests/interop/WSE2.0/SecSvc/Web.config \ - tests/LoanFlow/*.bpel \ - tests/LoanFlow/*.sql \ - tests/LoanFlow/*.vsp \ - tests/LoanFlow/*.wsdl \ - tests/LoanFlow/*.xml \ - tests/mix/*.bpel \ - tests/mix/*.sql \ - tests/mix/*.wsdl \ - tests/order/*.bpel \ - tests/order/*.sql \ - tests/order/*.vsp \ - tests/order/*.wsdl \ - tests/order/*.xml \ - tests/pick/*.bpel \ - tests/pick/*.sql \ - tests/pick/*.wsdl \ - tests/pick1/*.bpel \ - tests/pick1/*.sql \ - tests/pick1/*.wsdl \ - tests/pick1/*.xml \ - tests/post/*.bpel \ - tests/post/*.sql \ - tests/post/*.wsdl \ - tests/post/*.xml \ - tests/processXQuery/*.bpel \ - tests/processXQuery/*.sql \ - tests/processXQuery/*.vsp \ - tests/processXQuery/*.wsdl \ - tests/processXQuery/*.xml \ - tests/processXQuery/books.xq \ - tests/processXQuery/invoice.xq \ - tests/processXSLT/*.bpel \ - tests/processXSLT/*.sql \ - tests/processXSLT/*.vsp \ - tests/processXSLT/*.wsdl \ - tests/processXSLT/*.xml \ - tests/processXSLT/*.xslt \ - tests/processXSQL/*.bpel \ - tests/processXSQL/*.sql \ - tests/processXSQL/*.vsp \ - tests/processXSQL/*.wsdl \ - tests/processXSQL/*.xml \ - tests/processXSQL/selectCustomer.xsql \ - tests/processXSQL/selectProduct.xsql \ - tests/sqlexec/*.bpel \ - tests/sqlexec/*.sql \ - tests/sqlexec/*.vsp \ - tests/sqlexec/*.wsdl \ - tests/sqlexec/*.xml \ - tests/t1/buyer/*.bpel \ - tests/t1/buyer/*.sql \ - tests/t1/buyer/*.wsdl \ - tests/t1/seller/*.bpel \ - tests/t1/seller/*.sql \ - tests/t1/seller/*.wsdl \ - tests/t2/*.bpel \ - tests/t2/*.sql \ - tests/t2/*.wsdl \ - tests/t2/*.xml \ - tests/tevent/*.bpel \ - tests/tevent/*.sql \ - tests/tevent/*.wsdl \ - tests/tevent/*.xml \ - tests/tevent/AsyncBPELService/*.bpel \ - tests/tevent/AsyncBPELService/*.wsdl \ - tests/tevent/AsyncBPELService/*.xml \ - tests/tpcc/*.bpel \ - tests/tpcc/*.sql \ - tests/tpcc/*.wsdl \ - tests/tpcc/run.sh \ - tests/tver/*.bpel \ - tests/tver/*.sql \ - tests/tver/*.wsdl \ - tests/wsrm/*.bpel \ - tests/wsrm/*.sql \ - tests/wsrm/*.wsdl \ - tests/wss/*.bpel \ - tests/wss/*.sql \ - tests/wss/*.wsdl \ - tests/wss/ClientPrivate.pfx \ - tests/wss/ClientPublic.cer \ - tests/wss/dsa.pfx \ - tests/wss/ServerPrivate.pfx \ - tests/wss/ServerPublic.cer \ - vad_version \ - wsdl.xsd \ - xsql.xsd + $(srcdir)/$(STICKER) \ + $(srcdir)/*.cs \ + $(srcdir)/*.css \ + $(srcdir)/*.gif \ + $(srcdir)/*.jpg \ + $(srcdir)/*.sql \ + $(srcdir)/*.txt \ + $(srcdir)/*.vsp \ + $(srcdir)/*.vspx \ + $(srcdir)/*.xsd \ + $(srcdir)/*.xsl \ + $(srcdir)/.gitignore \ + $(srcdir)/101.HelloWorld/*.bpel \ + $(srcdir)/101.HelloWorld/*.wsdl \ + $(srcdir)/101.HelloWorld/*.xml \ + $(srcdir)/106.ParallelFlows/*.bpel \ + $(srcdir)/106.ParallelFlows/*.wsdl \ + $(srcdir)/106.ParallelFlows/*.xml \ + $(srcdir)/109.CorrelationSets/*.wsdl \ + $(srcdir)/109.CorrelationSets/*.xml \ + $(srcdir)/109.CorrelationSets/Buyer/*.bpel \ + $(srcdir)/109.CorrelationSets/Buyer/*.wsdl \ + $(srcdir)/109.CorrelationSets/Buyer/*.xml \ + $(srcdir)/109.CorrelationSets/Buyer/.project \ + $(srcdir)/109.CorrelationSets/Seller/*.bpel \ + $(srcdir)/109.CorrelationSets/Seller/*.wsdl \ + $(srcdir)/109.CorrelationSets/Seller/*.xml \ + $(srcdir)/109.CorrelationSets/Seller/.project \ + $(srcdir)/help/*.xml \ + $(srcdir)/i/*.gif \ + $(srcdir)/i/*.jpg \ + $(srcdir)/i/*.png \ + $(srcdir)/i/Thumbs.db \ + $(srcdir)/Makefile.am \ + $(srcdir)/system/bpel/*.xsd \ + $(srcdir)/tests/*.vsp \ + $(srcdir)/tests/*.xml \ + $(srcdir)/tests/bpel_engines/activeBPEL/*.txt \ + $(srcdir)/tests/bpel_engines/Twister/*.txt \ + $(srcdir)/tests/bpel_engines/Twister/*.xml \ + $(srcdir)/tests/echo/*.bpel \ + $(srcdir)/tests/echo/*.sql \ + $(srcdir)/tests/echo/*.vsp \ + $(srcdir)/tests/echo/*.wsdl \ + $(srcdir)/tests/echo/*.xml \ + $(srcdir)/tests/echo/ini.sh \ + $(srcdir)/tests/echovirt/*.bpel \ + $(srcdir)/tests/echovirt/*.sql \ + $(srcdir)/tests/echovirt/*.wsdl \ + $(srcdir)/tests/echovirt/*.xml \ + $(srcdir)/tests/fault1/*.bpel \ + $(srcdir)/tests/fault1/*.sql \ + $(srcdir)/tests/fault1/*.vsp \ + $(srcdir)/tests/fault1/*.wsdl \ + $(srcdir)/tests/fault1/*.xml \ + $(srcdir)/tests/fi/*.bpel \ + $(srcdir)/tests/fi/*.sql \ + $(srcdir)/tests/fi/*.vsp \ + $(srcdir)/tests/fi/*.wsdl \ + $(srcdir)/tests/fi/*.xml \ + $(srcdir)/tests/Flow/*.bpel \ + $(srcdir)/tests/Flow/*.sql \ + $(srcdir)/tests/Flow/*.wsdl \ + $(srcdir)/tests/Flow/*.xml \ + $(srcdir)/tests/interop/site/*.html \ + $(srcdir)/tests/interop/site/*.sql \ + $(srcdir)/tests/interop/site/Aecho/*.bpel \ + $(srcdir)/tests/interop/site/Aecho/*.sql \ + $(srcdir)/tests/interop/site/Aecho/*.wsdl \ + $(srcdir)/tests/interop/site/Aecho/*.xml \ + $(srcdir)/tests/interop/site/bpel4ws/*.css \ + $(srcdir)/tests/interop/site/bpel4ws/*.gif \ + $(srcdir)/tests/interop/site/bpel4ws/*.jpg \ + $(srcdir)/tests/interop/site/bpel4ws/*.png \ + $(srcdir)/tests/interop/site/bpel4ws/*.sql \ + $(srcdir)/tests/interop/site/bpel4ws/*.vsp \ + $(srcdir)/tests/interop/site/bpel4ws/*.vspx \ + $(srcdir)/tests/interop/site/bpel4ws/*.xml \ + $(srcdir)/tests/interop/site/bpel4ws/*.xsl \ + $(srcdir)/tests/interop/site/bpel4ws/clients/*.vspx \ + $(srcdir)/tests/interop/site/bpel4ws/clients/*.xsl \ + $(srcdir)/tests/interop/site/echo/*.bpel \ + $(srcdir)/tests/interop/site/echo/*.sql \ + $(srcdir)/tests/interop/site/echo/*.wsdl \ + $(srcdir)/tests/interop/site/echo/*.xml \ + $(srcdir)/tests/interop/site/RMecho/*.bpel \ + $(srcdir)/tests/interop/site/RMecho/*.sql \ + $(srcdir)/tests/interop/site/RMecho/*.wsdl \ + $(srcdir)/tests/interop/site/RMecho/*.xml \ + $(srcdir)/tests/interop/site/RMLoan/*.bpel \ + $(srcdir)/tests/interop/site/RMLoan/*.sql \ + $(srcdir)/tests/interop/site/RMLoan/*.vsp \ + $(srcdir)/tests/interop/site/RMLoan/*.wsdl \ + $(srcdir)/tests/interop/site/RMLoan/*.xml \ + $(srcdir)/tests/interop/site/SecAecho/*.bpel \ + $(srcdir)/tests/interop/site/SecAecho/*.sql \ + $(srcdir)/tests/interop/site/SecAecho/*.wsdl \ + $(srcdir)/tests/interop/site/SecAecho/*.xml \ + $(srcdir)/tests/interop/site/SecLoan/*.bpel \ + $(srcdir)/tests/interop/site/SecLoan/*.sql \ + $(srcdir)/tests/interop/site/SecLoan/*.vsp \ + $(srcdir)/tests/interop/site/SecLoan/*.wsdl \ + $(srcdir)/tests/interop/site/SecLoan/*.xml \ + $(srcdir)/tests/interop/site/SecLoan/ClientPrivate.pfx \ + $(srcdir)/tests/interop/site/SecLoan/ClientPublic.cer \ + $(srcdir)/tests/interop/site/SecLoan/ServerPrivate.pfx \ + $(srcdir)/tests/interop/site/SecLoan/ServerPublic.cer \ + $(srcdir)/tests/interop/site/SecRMLoan/*.bpel \ + $(srcdir)/tests/interop/site/SecRMLoan/*.sql \ + $(srcdir)/tests/interop/site/SecRMLoan/*.vsp \ + $(srcdir)/tests/interop/site/SecRMLoan/*.wsdl \ + $(srcdir)/tests/interop/site/SecRMLoan/*.xml \ + $(srcdir)/tests/interop/UseCases/*.bpel \ + $(srcdir)/tests/interop/UseCases/*.sql \ + $(srcdir)/tests/interop/UseCases/*.vsp \ + $(srcdir)/tests/interop/UseCases/*.wsdl \ + $(srcdir)/tests/interop/UseCases/*.xml \ + $(srcdir)/tests/interop/WSE2.0/*.bpel \ + $(srcdir)/tests/interop/WSE2.0/*.sql \ + $(srcdir)/tests/interop/WSE2.0/*.wsdl \ + $(srcdir)/tests/interop/WSE2.0/README \ + $(srcdir)/tests/interop/WSE2.0/SecClient/*.cs \ + $(srcdir)/tests/interop/WSE2.0/SecClient/Makefile \ + $(srcdir)/tests/interop/WSE2.0/SecClient/SecClient.exe.config \ + $(srcdir)/tests/interop/WSE2.0/SecSvc/*.cs \ + $(srcdir)/tests/interop/WSE2.0/SecSvc/Makefile \ + $(srcdir)/tests/interop/WSE2.0/SecSvc/SecSvc.asmx \ + $(srcdir)/tests/interop/WSE2.0/SecSvc/Web.config \ + $(srcdir)/tests/LoanFlow/*.bpel \ + $(srcdir)/tests/LoanFlow/*.sql \ + $(srcdir)/tests/LoanFlow/*.vsp \ + $(srcdir)/tests/LoanFlow/*.wsdl \ + $(srcdir)/tests/LoanFlow/*.xml \ + $(srcdir)/tests/mix/*.bpel \ + $(srcdir)/tests/mix/*.sql \ + $(srcdir)/tests/mix/*.wsdl \ + $(srcdir)/tests/order/*.bpel \ + $(srcdir)/tests/order/*.sql \ + $(srcdir)/tests/order/*.vsp \ + $(srcdir)/tests/order/*.wsdl \ + $(srcdir)/tests/order/*.xml \ + $(srcdir)/tests/pick/*.bpel \ + $(srcdir)/tests/pick/*.sql \ + $(srcdir)/tests/pick/*.wsdl \ + $(srcdir)/tests/pick1/*.bpel \ + $(srcdir)/tests/pick1/*.sql \ + $(srcdir)/tests/pick1/*.wsdl \ + $(srcdir)/tests/pick1/*.xml \ + $(srcdir)/tests/post/*.bpel \ + $(srcdir)/tests/post/*.sql \ + $(srcdir)/tests/post/*.wsdl \ + $(srcdir)/tests/post/*.xml \ + $(srcdir)/tests/processXQuery/*.bpel \ + $(srcdir)/tests/processXQuery/*.sql \ + $(srcdir)/tests/processXQuery/*.vsp \ + $(srcdir)/tests/processXQuery/*.wsdl \ + $(srcdir)/tests/processXQuery/*.xml \ + $(srcdir)/tests/processXQuery/books.xq \ + $(srcdir)/tests/processXQuery/invoice.xq \ + $(srcdir)/tests/processXSLT/*.bpel \ + $(srcdir)/tests/processXSLT/*.sql \ + $(srcdir)/tests/processXSLT/*.vsp \ + $(srcdir)/tests/processXSLT/*.wsdl \ + $(srcdir)/tests/processXSLT/*.xml \ + $(srcdir)/tests/processXSLT/*.xslt \ + $(srcdir)/tests/processXSQL/*.bpel \ + $(srcdir)/tests/processXSQL/*.sql \ + $(srcdir)/tests/processXSQL/*.vsp \ + $(srcdir)/tests/processXSQL/*.wsdl \ + $(srcdir)/tests/processXSQL/*.xml \ + $(srcdir)/tests/processXSQL/selectCustomer.xsql \ + $(srcdir)/tests/processXSQL/selectProduct.xsql \ + $(srcdir)/tests/sqlexec/*.bpel \ + $(srcdir)/tests/sqlexec/*.sql \ + $(srcdir)/tests/sqlexec/*.vsp \ + $(srcdir)/tests/sqlexec/*.wsdl \ + $(srcdir)/tests/sqlexec/*.xml \ + $(srcdir)/tests/t1/buyer/*.bpel \ + $(srcdir)/tests/t1/buyer/*.sql \ + $(srcdir)/tests/t1/buyer/*.wsdl \ + $(srcdir)/tests/t1/seller/*.bpel \ + $(srcdir)/tests/t1/seller/*.sql \ + $(srcdir)/tests/t1/seller/*.wsdl \ + $(srcdir)/tests/t2/*.bpel \ + $(srcdir)/tests/t2/*.sql \ + $(srcdir)/tests/t2/*.wsdl \ + $(srcdir)/tests/t2/*.xml \ + $(srcdir)/tests/tevent/*.bpel \ + $(srcdir)/tests/tevent/*.sql \ + $(srcdir)/tests/tevent/*.wsdl \ + $(srcdir)/tests/tevent/*.xml \ + $(srcdir)/tests/tevent/AsyncBPELService/*.bpel \ + $(srcdir)/tests/tevent/AsyncBPELService/*.wsdl \ + $(srcdir)/tests/tevent/AsyncBPELService/*.xml \ + $(srcdir)/tests/tpcc/*.bpel \ + $(srcdir)/tests/tpcc/*.sql \ + $(srcdir)/tests/tpcc/*.wsdl \ + $(srcdir)/tests/tpcc/run.sh \ + $(srcdir)/tests/tver/*.bpel \ + $(srcdir)/tests/tver/*.sql \ + $(srcdir)/tests/tver/*.wsdl \ + $(srcdir)/tests/wsrm/*.bpel \ + $(srcdir)/tests/wsrm/*.sql \ + $(srcdir)/tests/wsrm/*.wsdl \ + $(srcdir)/tests/wss/*.bpel \ + $(srcdir)/tests/wss/*.sql \ + $(srcdir)/tests/wss/*.wsdl \ + $(srcdir)/tests/wss/ClientPrivate.pfx \ + $(srcdir)/tests/wss/ClientPublic.cer \ + $(srcdir)/tests/wss/dsa.pfx \ + $(srcdir)/tests/wss/ServerPrivate.pfx \ + $(srcdir)/tests/wss/ServerPublic.cer \ + $(srcdir)/vad_version diff --git a/binsrc/bpel/bpel_eng.sql b/binsrc/bpel/bpel_eng.sql index 4dba018749..949a87df28 100644 --- a/binsrc/bpel/bpel_eng.sql +++ b/binsrc/bpel/bpel_eng.sql @@ -2862,7 +2862,7 @@ create procedure BPEL..default_smtp_server () declare mail_server varchar; mail_server := BPEL..get_conf_param ('MailServer'); if (mail_server is null) - return cfg_item_value(virtuoso_ini_path(), 'HTTPServer', 'DefaultMailServer'); + return virtuoso_ini_item_value ('HTTPServer', 'DefaultMailServer'); return mail_server; } ; diff --git a/binsrc/bpel/bpel_sticker.xml b/binsrc/bpel/bpel_sticker.xml new file mode 100644 index 0000000000..fceef8ea83 --- /dev/null +++ b/binsrc/bpel/bpel_sticker.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + ; + + + ; + + + + + '*ini*',lhost=>'*ini*',lpath=>'/BPEL'); + vhost_define (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPEL',ppath=>'/SOAP/',soap_user=>'BPEL'); + VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELGUI'); + vhost_define (vhost=>'*ini*', lhost=>'*ini*', lpath=>'/BPELGUI/', ppath=>'$BASE_PATH$/bpel4ws/1.0/', vsp_user=>'BPEL', def_page=>'main_tabs.vspx', is_dav=>$ISDAV$); + VHOST_REMOVE (lpath=>'/BPELDemo'); + vhost_define (lpath=>'/BPELDemo', ppath=>'$BASE_PATH$/bpeldemo/', vsp_user=>'dba', def_page=>'index.vsp', is_dav=>$ISDAV$); + registry_set('_bpel4ws_path_', '$BASE_PATH$/bpel4ws/1.0/'); + registry_set('_bpel4ws_version_', '$VERSION$'); + registry_set('_bpel4ws_build_', '$PACKDATE$'); + registry_set('__external_xsql_xslt', '1'); + set_qualifier ('DB'); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/bpel_ddl.sql', 0, 'report', $ISDAV$); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/bpel_eng.sql', 1, 'report', $ISDAV$); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/xsql.sql', 1, 'report', $ISDAV$); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/filesystem.sql', 1, 'report', $ISDAV$); + EXEC ('create procedure BPEL.BPEL.res_base_uri () { return \'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:$BASE_PATH$/\'; }' ); + set_qualifier ('BPEL'); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/bpel_intrp.sql', 1, 'report', $ISDAV$); + set_qualifier ('DB'); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/install.sql', 1, 'report', $ISDAV$); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/process.sql', 1, 'report', $ISDAV$); + BPEL.BPEL.java_init (); + result ('00000', 'GUI is accesible via http://host:port/BPELGUI'); + result ('00000', 'Quick Start is available from http://host:port/BPELGUI/start.vsp'); + ]]> + + + '*ini*',lhost=>'*ini*',lpath=>'/BPEL'); + VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELGUI'); + VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELDemo'); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/drop_prc.sql', 1, 'report', $ISDAV$); + DB.DBA.VAD_LOAD_SQL_FILE('$BASE_PATH$/bpel4ws/1.0/drop.sql', 1, 'report', $ISDAV$); + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/binsrc/bpel/bpel_style.xsl b/binsrc/bpel/bpel_style.xsl index 6ddae328b8..dd213f9ed2 100644 --- a/binsrc/bpel/bpel_style.xsl +++ b/binsrc/bpel/bpel_style.xsl @@ -148,7 +148,7 @@ - <?vsp if (atoi (cfg_item_value (virtuoso_ini_path(), 'HTTPServer', 'ServerThreads')) < 2) { ?> + <?vsp if (atoi (virtuoso_ini_item_value ('HTTPServer', 'ServerThreads')) < 2) { ?> <?vsp http_value('Warning: Only 1 thread allocated for web services. The BPEL user interface will not be operational'); ?> diff --git a/binsrc/bpel/make_vad.sh b/binsrc/bpel/make_vad.sh deleted file mode 100755 index 27c7b81691..0000000000 --- a/binsrc/bpel/make_vad.sh +++ /dev/null @@ -1,710 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2024 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - - - -# ---------------------------------------------------------------------- -# Fix issues with LOCALE -# ---------------------------------------------------------------------- -LANG=C -LC_ALL=POSIX -export LANG LC_ALL - - -# check version_init procedure below -VERSION="1.05.05" -LOGDIR=`pwd` -LOGFILE="${LOGDIR}/make_bpel_vad.log" -STICKER_DAV="vad_dav.xml" -STICKER_FS="vad_fs.xml" -PACKDATE=`date +"%Y-%m-%d %H:%M"` -SERVER=${SERVER-} -THOST=${THOST-localhost} -TPORT=${TPORT-8445} -PORT=${PORT-1940} -ISQL=${ISQL-isql} -VAD_NAME="bpel4ws" -VAD_PKG_NAME="bpel" -VAD_NAME_DEVEL="$VAD_PKG_NAME"_filesystem.vad -VAD_NAME_RELEASE="$VAD_PKG_NAME"_dav.vad -DSN="$HOST:$PORT" -HOST_OS=`uname -s | grep WIN` -if [ "x$HOST_OS" != "x" ] -then -TEMPFILE="`cygpath -m $TMP/isql.$$`" -if [ "x$SRC" != "x" ] -then -HOME=$SRC -else -HOME="`cygpath -m $HOME`" -fi -LN="cp -rf" -RM="rm -rf" -else -TEMPFILE=/tmp/isql.$$ -LN="ln -fs" -RM="rm -f" -fi -VOS=0 -if [ -f ../../autogen.sh ] -then - VOS=1 -fi - -if [ "z$SERVER" = "z" ] -then - if [ "x$HOST_OS" != "x" ] - then - SERVER=virtuoso-odbc-t.exe - else - SERVER=virtuoso - fi -fi - -. $HOME/binsrc/tests/suite/test_fn.sh - -if [ -f /usr/xpg4/bin/rm ] -then - myrm=/usr/xpg4/bin/rm -else - myrm=rm -fi - -version_init() -{ - if [ $VOS -eq 1 ] - then - if [ -f vad_version ] - then - VERSION=`cat vad_version` - else - LOG "The vad_version does not exist, please verify your checkout" - exit 1 - fi - else - rm -f version.tmp - for i in `find . -name 'Entries' | grep -v "vad/"`; do - cat $i | grep "^[^D].*" | cut -f 3 -d "/" | sed -e "s/1\.//g" >> version.tmp - done - VERSION=`cat version.tmp | awk ' BEGIN { cnt=9 } { cnt = cnt + $1 } END { printf "1.%02.02f", cnt/100 }'` - rm -f version.tmp - echo "$VERSION" > vad_version - fi -} - - -do_command_safe () { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* 2>&1 > "${LOGFILE}.tmp" - if test $? -ne 0 - then - cat "${LOGFILE}.tmp" >> ${LOGFILE} - LOG "***FAILED: starting $command" - else - if egrep '^\*\*\*' "${LOGFILE}.tmp" > /dev/null - then - LOG "***FAILED: execution of $command" - msg=`cat ${LOGFILE}.tmp` - echo "------------ SQL ERROR -------------" - echo "$msg" - echo "------------------------------------" - echo "------------ SQL ERROR -------------" >> $LOGFILE - echo "$msg" >> $LOGFILE - echo "------------------------------------" >> $LOGFILE - else - LOG "PASSED: $command" - fi - fi - rm "${LOGFILE}.tmp" 2>/dev/null -} - -do_command() { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - if test $? -ne 0 - then - LOG "***FAILED: $command" - else - LOG "PASSED: $command" - fi -} - -directory_clean() { - $myrm -rf vad 2>/dev/null - $myrm -rf vad.* 2>/dev/null - $myrm -rf make_vad.log 2>/dev/null - $myrm -rf virtuoso.db 2>/dev/null - $myrm -rf virtuoso.trx 2>/dev/null - $myrm -rf virtuoso.tdb 2>/dev/null - $myrm -rf virtuoso.log 2>/dev/null - $myrm -rf virtuoso.ini 2>/dev/null -} - -directory_init() { - mkdir vad - mkdir vad/code - mkdir vad/code/bpel4ws/ - mkdir vad/code/bpel4ws/1.0/ - cp *.sql vad/code/bpel4ws/1.0/ - - mkdir vad/vsp - mkdir vad/vsp/bpel4ws/ - mkdir vad/vsp/bpel4ws/1.0/ - mkdir vad/vsp/bpel4ws/1.0/help/ - mkdir vad/vsp/bpel4ws/1.0/i/ - mkdir vad/vsp/bpeldemo/ - mkdir vad/vsp/bpeldemo/echo - mkdir vad/vsp/bpeldemo/fi - mkdir vad/vsp/bpeldemo/LoanFlow - mkdir vad/vsp/bpeldemo/SecLoan - mkdir vad/vsp/bpeldemo/RMLoan - mkdir vad/vsp/bpeldemo/SecRMLoan - mkdir vad/vsp/bpeldemo/sqlexec - mkdir vad/vsp/bpeldemo/UseCases - mkdir vad/vsp/bpeldemo/java_exec - mkdir vad/vsp/bpeldemo/clr_exec - mkdir vad/vsp/bpeldemo/processXSLT - mkdir vad/vsp/bpeldemo/processXSQL - mkdir vad/vsp/bpeldemo/processXQuery - - # APPLICATION - cp *.vspx vad/vsp/bpel4ws/1.0/ - cp *.vsp vad/vsp/bpel4ws/1.0/ - cp *.xsd vad/vsp/bpel4ws/1.0/ - cp *.xsl vad/vsp/bpel4ws/1.0/ - cp *.gif vad/vsp/bpel4ws/1.0/ - cp *.jpg vad/vsp/bpel4ws/1.0/ - cp *.css vad/vsp/bpel4ws/1.0/ - - # HELP - cp help/* vad/vsp/bpel4ws/1.0/help/ - - # Icons - cp i/* vad/vsp/bpel4ws/1.0/i/ - - # SAMPLES - cp tests/echo/echo.* vad/vsp/bpeldemo/echo - cp tests/echo/bpel.xml vad/vsp/bpeldemo/echo - cp tests/echo/options.xml vad/vsp/bpeldemo/echo - - cp tests/fi/fi.* vad/vsp/bpeldemo/fi - cp tests/fi/fi_wsdl.vsp vad/vsp/bpeldemo/fi - cp tests/fi/service.vsp vad/vsp/bpeldemo/fi - cp tests/fi/options.xml vad/vsp/bpeldemo/fi - cp tests/fi/bpel.xml vad/vsp/bpeldemo/fi - - cp -f tests/LoanFlow/* vad/vsp/bpeldemo/LoanFlow 2>/dev/null - cp -f tests/interop/site/SecLoan/* vad/vsp/bpeldemo/SecLoan 2>/dev/null - cp -f tests/interop/site/RMLoan/* vad/vsp/bpeldemo/RMLoan 2>/dev/null - cp -f tests/interop/site/SecRMLoan/* vad/vsp/bpeldemo/SecRMLoan 2>/dev/null - cp -f tests/sqlexec/* vad/vsp/bpeldemo/sqlexec 2>/dev/null - cp tests/index.xml vad/vsp/bpeldemo - cp tests/index.vsp vad/vsp/bpeldemo - cp -f tests/interop/UseCases/* vad/vsp/bpeldemo/UseCases 2>/dev/null - cp tests/processXSLT/* vad/vsp/bpeldemo/processXSLT 2>/dev/null - cp tests/processXSQL/* vad/vsp/bpeldemo/processXSQL 2>/dev/null - cp tests/processXQuery/* vad/vsp/bpeldemo/processXQuery 2>/dev/null - - cp tests/fault1/java* vad/vsp/bpeldemo/java_exec - cd vad/vsp/bpeldemo/java_exec - mv java_exec_bpel.xml bpel.xml - mv java_exec.xml options.xml - mv java_exec_desc.xml java_exec.xml - cd ../../../../ - - cp tests/fault1/clr* vad/vsp/bpeldemo/clr_exec - cd vad/vsp/bpeldemo/clr_exec - mv clr_exec_bpel.xml bpel.xml - mv clr_exec.xml options.xml - mv clr_exec_desc.xml clr_exec.xml - cd ../../../../ - - -} - -virtuoso_start() { - timeout=120 - - ECHO "Starting Virtuoso server ..." - if [ "z$HOST_OS" != "z" ] - then - "$SERVER" +foreground & - - starth=`date | cut -f 2 -d :` - starts=`date | cut -f 3 -d :|cut -f 1 -d " "` - - while true - do - sleep 6 - if (netstat -an | grep "[\.\:]$PORT" | grep LISTEN > /dev/null) - then - break - fi - nowh=`date | cut -f 2 -d :` - nows=`date | cut -f 3 -d : | cut -f 1 -d " "` - - nowh=`expr $nowh - $starth` - nows=`expr $nows - $starts` - - nows=`expr $nows + $nowh \* 60` - if test $nows -ge $timeout - then - ECHO "***FAILED: Could not start Virtuoso Server within $timeout seconds" - exit 1 - fi - done - else - "$SERVER" +wait - if test $? -ne 0 - then - ECHO "***FAILED: Could not start Virtuoso Server" - exit 1 - fi - fi - - ECHO "Virtuoso server started" - return 0 -} - -virtuoso_shutdown() { - LOG "Shutdown Virtuoso Server..." - $ISQL $DSN dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=raw_exit();" $* >/dev/null - #sleep 10 -} - -sticker_init() { - ISDAV=$1 - if [ "$ISDAV" = "1" ] ; then - BASE_PATH_HTTP="/DAV/VAD/" - BASE_PATH_CODE="/DAV/VAD/" - TYPE="dav" - STICKER=$STICKER_DAV - PPATH="/DAV/VAD/bpel4ws/1.0/" - DPPATH="/DAV/VAD" - else - BASE_PATH_HTTP="./vad/vsp/" - BASE_PATH_CODE="./vad/vsp/" - TYPE="http" - STICKER=$STICKER_FS - PPATH="/vad/vsp/bpel4ws/1.0/" - DPPATH="/vad/vsp" - fi - LOG "VAD Sticker $STICKER creation..." - echo "" > $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - #echo " DB.DBA.VAD_LOAD_SQL_FILE('./vad/code/bpel4ws/1.0/postinstall.sql', 0, 'report', 0);" >> $STICKER - # echo " BPEL.BPEL.upload_script ('file://vad/vsp/bpel4ws/1.0/samples/echo/','echo.bpel','echo.wsdl');" >> $STICKER - echo " ; " >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " DB.DBA.USER_CREATE ('BPEL', uuid(), vector ('DISABLED', 1));" >> $STICKER - echo " EXEC ('grant all privileges to BPEL');" >> $STICKER - echo " EXEC ('grant execute on DB.DBA.WSRMSequence to BPEL');" >> $STICKER - echo " EXEC ('grant execute on DB.DBA.WSRMSequenceTerminate to BPEL');" >> $STICKER - echo " EXEC ('grant execute on DB.DBA.WSRMAckRequested to BPEL');" >> $STICKER - echo " user_set_qualifier ('BPEL', 'BPEL');" >> $STICKER - echo " VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPEL');" >> $STICKER - echo " vhost_define (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPEL',ppath=>'/SOAP/',soap_user=>'BPEL');" >> $STICKER - echo " VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELGUI');" >> $STICKER - echo " vhost_define (vhost=>'*ini*', lhost=>'*ini*', lpath=>'/BPELGUI/', ppath=>'"$PPATH"', vsp_user=>'BPEL', def_page=>'main_tabs.vspx', is_dav=>$ISDAV);" >> $STICKER - echo " VHOST_REMOVE (lpath=>'/BPELDemo');" >> $STICKER - echo " vhost_define (lpath=>'/BPELDemo', ppath=>'"$DPPATH/bpeldemo/"', vsp_user=>'dba', def_page=>'index.vsp', is_dav=>$ISDAV);" >> $STICKER - echo " registry_set('_"$VAD_NAME"_path_', 'file:/vad/vsp/bpel4ws/1.0/');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_version_', '$VERSION');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_build_', '$PACKDATE');" >> $STICKER - echo " registry_set('__external_xsql_xslt', '1');" >> $STICKER - echo " set_qualifier ('DB');" >> $STICKER -# echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/drop.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/bpel_ddl.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/bpel_eng.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/xsql.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/filesystem.sql', 1, 'report', $ISDAV);" >> $STICKER -if [ "$ISDAV" = "1" ] ; then - echo " EXEC ('create procedure BPEL.BPEL.res_base_uri () { return \'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:/DAV/VAD/\'; }' );" >> $STICKER -else - echo " EXEC ('create procedure BPEL.BPEL.res_base_uri () { return \'file://vad/vsp/\'; }' );" >> $STICKER -fi - echo " set_qualifier ('BPEL');" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/bpel_intrp.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " set_qualifier ('DB');" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/install.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/process.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " BPEL.BPEL.java_init ();" >> $STICKER - echo " result ('00000', 'GUI is accesible via http://host:port/BPELGUI');" >> $STICKER - echo " result ('00000', 'Quick Start is available from http://host:port/BPELGUI/start.vsp');" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " set_qualifier ('DB');" >> $STICKER - echo " VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPEL');" >> $STICKER - echo " VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELGUI');" >> $STICKER - echo " VHOST_REMOVE (vhost=>'*ini*',lhost=>'*ini*',lpath=>'/BPELDemo');" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/drop_prc.sql', 1, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"bpel4ws/1.0/drop.sql', 1, 'report', $ISDAV);" >> $STICKER -# echo " DB.DBA.USER_DROP ('BPEL');" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - #echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - - for css in `ls *.css`; do - echo " " >> $STICKER - done - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - - echo " " >> $STICKER - for file in `find vad/vsp/bpeldemo -type f -print | sort` - do - name=`echo "$file" | cut -b18-` - case "$name" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac - echo " " >> $STICKER - done - - - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER -} - -virtuoso_init() { - LOG "Virtuoso.ini creation..." - echo " -[Database] -DatabaseFile = vad.db -TransactionFile = vad.trx -ErrorLogFile = vad.log -ErrorLogLevel = 7 -FileExtend = 200 -Striping = 0 -LogSegments = 0 -Syslog = 0 -; -; Server parameters -; -[Parameters] -ServerPort = $PORT -ServerThreads = 100 -CheckpointInterval = 0 -NumberOfBuffers = 2000 -MaxDirtyBuffers = 1200 -MaxCheckpointRemap = 2000 -UnremapQuota = 0 -AtomicDive = 1 -PrefixResultNames = 0 -CaseMode = 2 -DisableMtWrite = 0 -MaxStaticCursorRows = 5000 -AllowOSCalls = 0 -DirsAllowed = . -CallstackOnException = 1 - -; -; HTTP server parameters -; -; Timeout values are seconds -; - -[!HTTPServer] -ServerPort = $TPORT -ServerRoot = . -ServerThreads = 5 -MaxKeepAlives = 10 -EnabledDavVSP = 1 - -[Client] -SQL_QUERY_TIMEOUT = 0 -SQL_TXN_TIMEOUT = 0 -SQL_PREFETCH_ROWS = 100 -SQL_PREFETCH_BYTES = 16000 -SQL_NO_CHAR_C_ESCAPE = 0 - -[AutoRepair] -BadParentLinks = 0 -BadDTP = 0 - -[Replication] -ServerName = the_big_server -ServerEnable = 1 -QueueMax = 50000" > virtuoso.ini - - virtuoso_start -} - -BPELGRANTS="DB.DBA.WSDL_EXPAND -DB.DBA.XML_URI_RESOLVE_LIKE_GET -DB.DBA.XML_URI_GET -BPEL.BPEL.schedule_request -DB.DBA.XML_URI_GET_STRING -DB.DBA.FILE_TO_STRING" - - -grant_exec_to_all() { - grep 'procedure BPEL.BPEL.' vad/code/bpel4ws/1.0/*.sql | awk ' { print "grant execute on "$3" to BPEL;" } ' > vad/code/bpel4ws/1.0/postinstall.sql - for gr in $BPELGRANTS; do - echo "grant execute on $gr to BPEL;" >> vad/code/bpel4ws/1.0/postinstall.sql - done - cat >> vad/code/bpel4ws/1.0/postinstall.sql </dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: BPEL4WS PACKAGING, isql is not available" - exit 1 -fi -$SERVER -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: BPEL4WS PACKAGING, server is not available" - exit 1 -fi - - -virtuoso_shutdown -directory_clean -directory_init -virtuoso_init -version_init -sticker_init 1 -sticker_init 0 -vad_create $STICKER_FS $VAD_NAME_DEVEL -vad_create $STICKER_DAV $VAD_NAME_RELEASE -virtuoso_shutdown -chmod 644 $VAD_NAME_DEVEL -chmod 644 $VAD_NAME_RELEASE -directory_clean - -CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" -if test $STATUS -eq 0 -then - $myrm -f *.vad - exit 1 -fi - -BANNER "COMPLETED VAD PACKAGING" -exit 0 diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl index 4e7d55e820..f1f2e9a0d1 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl @@ -120,7 +120,7 @@ - <?vsp if (atoi (cfg_item_value (virtuoso_ini_path(), 'HTTPServer', 'ServerThreads')) < 2) { ?> + <?vsp if (atoi (virtuoso_ini_item_value ('HTTPServer', 'ServerThreads')) < 2) { ?> <?vsp http_value('Warning: Only 1 thread allocated for web services. The BPEL user interface will not be operational'); ?> diff --git a/binsrc/bpel/vad_version b/binsrc/bpel/vad_version index 320e23c667..c55349029d 100644 --- a/binsrc/bpel/vad_version +++ b/binsrc/bpel/vad_version @@ -1 +1 @@ -1.40.62 +1.40.64 diff --git a/binsrc/conductor/.gitignore b/binsrc/conductor/.gitignore index 932e2c2872..b604ed2859 100644 --- a/binsrc/conductor/.gitignore +++ b/binsrc/conductor/.gitignore @@ -1,12 +1,11 @@ *.vspx-m *.vspx-sql *.vspx-m0 +*.vad +oat +xddl virtuoso.lic mkvad.output -yacutia_dav.vad -yacutia_filesystem.vad -conductor_dav.vad -conductor_filesystem.vad vad_dav.xml vad_fs.xml virtuoso.pxa diff --git a/binsrc/conductor/Makefile.am b/binsrc/conductor/Makefile.am index 7f70037583..6269b5b58c 100644 --- a/binsrc/conductor/Makefile.am +++ b/binsrc/conductor/Makefile.am @@ -25,22 +25,46 @@ if WITH_CONDUCTOR_VAD nodist_vad_DATA = conductor_dav.vad endif -noinst_SCRIPTS = mkvad.sh +NEED_VERSION = 07.20.3226 +STICKER = conductor_sticker.xml +VERBOSE = #--verbose +VERSION = `cat vad_version` + +DAV_FLAGS = $(VERBOSE) \ + --prefix "$(srcdir)" \ + --var="BASE_PATH=/DAV/VAD" \ + --var="ISDAV=1" \ + --var="NEED_VERSION=$(NEED_VERSION)" \ + --var="TYPE=dav" \ + --var="VERSION=$(VERSION)" + +conductor_dav.vad: $(EXTRA_DIST) Makefile + $(PYTHON) $(top_srcdir)/binsrc/vadpacker/vadpacker.py \ + -o $(builddir)/conductor_dav.vad \ + $(DAV_FLAGS) \ + $(srcdir)/$(STICKER) + + +# ---------------------------------------------------------------------- +# +# Cleanup +# +# ---------------------------------------------------------------------- CLEANFILES = \ - mkvad.output \ - yacutia_dav.vad \ - yacutia_filesystem.vad \ conductor_dav.vad \ conductor_filesystem.vad \ + mkvad.output \ + mkvad.pxa \ + mkvad.tdb \ vad_dav.xml \ vad_fs.xml \ - virtuoso.pxa - -conductor_filesystem.vad conductor_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost $(SHELL) ./mkvad.sh + yacutia_dav.vad \ + yacutia_filesystem.vad clean-local: - -rm -rf vad + -$(RM) -rf vad + -$(RM) sticker.out + # ---------------------------------------------------------------------- # @@ -48,39 +72,39 @@ clean-local: # # ---------------------------------------------------------------------- EXTRA_DIST = \ - css/*.css \ - *.htm \ - *.html \ - js/*.js \ - sql/*.sql \ - *.vsp \ - *.vspx \ - *.xml \ - *.xsl \ - conductor.list \ - dav/*.css \ - dav/*.js \ - dav/*.sql \ - dav/*.vsp \ - dav/*.xsl \ - dav/image/*.gif \ - dav/image/*.png \ - dav/image/dav/*.gif \ - dav/image/dav/*.png \ - ent.dtd \ - help/*.xml \ - images/*.gif \ - images/*.jpg \ - images/*.png \ - images/buttons/*.png \ - images/dav_browser/*.png \ - images/icons/*.gif \ - images/icons/*.png \ - images/pager/*.png \ - INSTALL \ - mkvad.ini \ - mkvad.sh \ - README \ - syntax/*.css \ - syntax/*.js \ - vad_version + $(srcdir)/$(STICKER) \ + $(srcdir)/*.dtd \ + $(srcdir)/*.htm \ + $(srcdir)/*.html \ + $(srcdir)/*.vsp \ + $(srcdir)/*.vspx \ + $(srcdir)/*.xml \ + $(srcdir)/*.xsl \ + $(srcdir)/INSTALL \ + $(srcdir)/README \ + $(srcdir)/conductor.list \ + $(srcdir)/css/*.css \ + $(srcdir)/dav/*.css \ + $(srcdir)/dav/*.js \ + $(srcdir)/dav/*.sql \ + $(srcdir)/dav/*.vsp \ + $(srcdir)/dav/*.xsl \ + $(srcdir)/dav/image/*.gif \ + $(srcdir)/dav/image/*.png \ + $(srcdir)/dav/image/dav/*.gif \ + $(srcdir)/dav/image/dav/*.png \ + $(srcdir)/help/*.xml \ + $(srcdir)/images/*.gif \ + $(srcdir)/images/*.jpg \ + $(srcdir)/images/*.png \ + $(srcdir)/images/buttons/*.png \ + $(srcdir)/images/dav_browser/*.png \ + $(srcdir)/images/icons/*.gif \ + $(srcdir)/images/icons/*.png \ + $(srcdir)/images/icons/*.svg \ + $(srcdir)/images/pager/*.png \ + $(srcdir)/js/*.js \ + $(srcdir)/sql/*.sql \ + $(srcdir)/syntax/*.css \ + $(srcdir)/syntax/*.js \ + $(srcdir)/vad_version diff --git a/binsrc/conductor/account_create.vspx b/binsrc/conductor/account_create.vspx index 4eefe0f18e..d54ed4d088 100644 --- a/binsrc/conductor/account_create.vspx +++ b/binsrc/conductor/account_create.vspx @@ -457,7 +457,7 @@ MB - + DAV quota not enforced due to virtuoso ini setting diff --git a/binsrc/conductor/cond_help.html b/binsrc/conductor/cond_help.html index b44308dc76..ae2eabfc89 100644 --- a/binsrc/conductor/cond_help.html +++ b/binsrc/conductor/cond_help.html @@ -30,8 +30,8 @@ Virtuoso Conductor Help - - diff --git a/binsrc/conductor/conductor.list b/binsrc/conductor/conductor.list index 8cea49756f..ebe78c9cf3 100644 --- a/binsrc/conductor/conductor.list +++ b/binsrc/conductor/conductor.list @@ -213,7 +213,6 @@ conductor/hosted_modules_show_sql.vsp conductor/hosted_modules.vspx conductor/hosted_page.vspx conductor/http_add_path.vspx -conductor/http_svc_edit.vspx conductor/http_del_path.vspx conductor/http_edit_paths.vspx conductor/http_host_clone.vspx @@ -221,6 +220,7 @@ conductor/http_host_edit.vspx conductor/http_listeners.vspx conductor/http_serv_mgmt.vspx conductor/http_serv_monitoring.vspx +conductor/http_svc_edit.vspx conductor/http_tcn.vspx conductor/http_url_rewrite.vspx conductor/ie_browser.vspx @@ -275,8 +275,8 @@ conductor/images/icons/del_16.png conductor/images/icons/disconnect_16.png conductor/images/icons/docs_16.png conductor/images/icons/edit_16.png -conductor/images/icons/eye.svg conductor/images/icons/eye-slash.svg +conductor/images/icons/eye.svg conductor/images/icons/fastf_16.png conductor/images/icons/filter_16.png conductor/images/icons/filter_32.png diff --git a/binsrc/conductor/conductor_sticker.xml b/binsrc/conductor/conductor_sticker.xml new file mode 100644 index 0000000000..1ffb915fb0 --- /dev/null +++ b/binsrc/conductor/conductor_sticker.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + '/conductor'); + vhost_remove (lpath=>'/vspx'); + vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor'); + vhost_define (lpath=>'/conductor',ppath=>'$BASE_PATH$/conductor/', is_dav=>$ISDAV$, vsp_user=>'dba', is_brws=>0, def_page=>'main_tabs.vspx'); + vhost_define (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor',ppath=>'$BASE_PATH$/conductor/', is_dav=>$ISDAV$, vsp_user=>'dba', is_brws=>0, def_page=>'main_tabs.vspx'); + "DB"."DBA"."VAD_LOAD_SQL_FILE"('$BASE_PATH$/conductor/sql/xddl.sql', 1, 'report', $ISDAV$); + "DB"."DBA"."VAD_LOAD_SQL_FILE"('$BASE_PATH$/conductor/sql/xddl_dav.sql', 1, 'report', $ISDAV$); + if ($ISDAV$ = 1) + { + for (select RES_FULL_PATH as X from WS.WS.SYS_DAV_RES where RES_FULL_PATH like '$BASE_PATH$/conductor/%.xsl') do + { + DB.DBA.DAV_PROP_SET_INT (X, ':getlastmodified', now (), null, null, 0, auth_uid=>http_dav_uid ()); + xslt_stale ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || X); + } + } + ]]> + + + '/conductor'); + vhost_remove (lpath=>'/vspx'); + vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor'); + vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/vspx'); + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/binsrc/conductor/databases_table_edit.vspx b/binsrc/conductor/databases_table_edit.vspx index 398aa2ce5a..6eccee8f53 100644 --- a/binsrc/conductor/databases_table_edit.vspx +++ b/binsrc/conductor/databases_table_edit.vspx @@ -38,6 +38,7 @@ + @@ -406,7 +407,7 @@ - @@ -419,13 +420,16 @@ stat := '00000'; commit work; __set_user_id (connection_get ('vspx_user'), 1); + set_qualifier (coalesce (self.trig_sch, 'DB')); exec (self.crtrig_textfield.ufl_value, stat, msg); __set_user_id (user); + set_qualifier ('DB'); if (stat = '00000') { self.m_create := 0; self.trig_name := ''; - self.ds_trig.vc_data_bind(e); - self.crtrig_temp2.vc_data_bind (e); + self.trig_sch := 'DB'; + self.ds_trig.vc_data_bind(e); + self.crtrig_temp2.vc_data_bind (e); } else { @@ -444,7 +448,7 @@ + sql="select T_NAME, coalesce(T_TEXT,T_MORE) as T_TEXT, T_SCH from SYS_TRIGGERS where T_TABLE = :self.name" > @@ -454,8 +458,9 @@ @@ -481,7 +486,8 @@ self.trig_name := (control.vc_parent as vspx_row_template).te_rowset[0]; self.m_create := 1; self.crtrig_temp2.vc_data_bind (e); - self.crtrig_textfield.ufl_value := (control.vc_parent as vspx_row_template).te_rowset[1]; + self.crtrig_textfield.ufl_value := (control.vc_parent as vspx_row_template).te_rowset[1]; + self.trig_sch := (control.vc_parent as vspx_row_template).te_rowset[2]; ]]> diff --git a/binsrc/conductor/dav/dav_browser.sql b/binsrc/conductor/dav/dav_browser.sql index 2e886a2f38..2bfff9d79f 100644 --- a/binsrc/conductor/dav/dav_browser.sql +++ b/binsrc/conductor/dav/dav_browser.sql @@ -1911,7 +1911,7 @@ create procedure WEBDAV.DBA.host_url ( } else { - host := cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost'); + host := virtuoso_ini_item_value ('URIQA', 'DefaultHost'); if (host is null) { host := sys_stat ('st_host_name'); @@ -2882,7 +2882,8 @@ create procedure WEBDAV.DBA.det_api_key ( in name varchar) { declare retValue any; - + if (not table_exists ('OAUTH.DBA.APP_REG')) + return null; retValue := WEBDAV.DBA.exec ('select a_key from OAUTH..APP_REG where WEBDAV.DBA.service_name (a_name) = WEBDAV.DBA.service_name (?) and a_owner = 0', vector (name)); if (WEBDAV.DBA.isVector (retValue) and length (retValue)) return retValue[0][0]; @@ -4633,7 +4634,7 @@ create procedure WEBDAV.DBA.send_mail_internal ( declare _message varchar; declare _smtp_server any; - _smtp_server := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'DefaultMailServer'); + _smtp_server := virtuoso_ini_item_value ('HTTPServer', 'DefaultMailServer'); if (_smtp_server = 0) return; @@ -5350,7 +5351,7 @@ create procedure WEBDAV.DBA.ssl2iri ( if (iri not like 'http://%') { - noSsl := cfg_item_value (virtuoso_ini_path (), 'URIQA', 'DefaultHost'); + noSsl := virtuoso_ini_item_value ('URIQA', 'DefaultHost'); if (noSsl is not null) { V := rfc1808_parse_uri (iri); @@ -5646,6 +5647,8 @@ create procedure WEBDAV.DBA.oauth_exist () { declare retValue any; + if (not table_exists ('OAUTH.DBA.APP_REG')) + return 0; retValue := WEBDAV.DBA.exec ('select TOP 1 1 from OAUTH.DBA.APP_REG where A_TYPE = 1'); if (WEBDAV.DBA.isVector (retValue) and (length (retValue) = 1)) return 1; @@ -5661,6 +5664,8 @@ create procedure WEBDAV.DBA.oauth_list () declare retValue, items, tmp any; retValue := vector (); + if (not table_exists ('OAUTH..APP_REG')) + return retValue; items := WEBDAV.DBA.exec ('select A_NAME, A_DESCR from OAUTH.DBA.APP_REG where A_TYPE = 1 order by A_NAME'); foreach (any item in items) do { diff --git a/binsrc/conductor/dav/dav_browser.xsl b/binsrc/conductor/dav/dav_browser.xsl index 8c54005fd5..621484f3d8 100644 --- a/binsrc/conductor/dav/dav_browser.xsl +++ b/binsrc/conductor/dav/dav_browser.xsl @@ -3917,6 +3917,7 @@ { DB.DBA.DAV_PROP_REMOVE_INT (dav_fullPath, item[0], null, null, 0, 0, 0); } + if (table_exists ('DB.DBA.SYNC_COLS_TYPES')) WEBDAV.DBA.exec ('delete from DB.DBA.SYNC_COLS_TYPES where CT_COL_ID = ?', vector (DB.DBA.DAV_SEARCH_ID (dav_fullPath, 'C'))); } } diff --git a/binsrc/conductor/db_rdf_objects.vspx b/binsrc/conductor/db_rdf_objects.vspx index 5d816cf7df..ac62318a28 100644 --- a/binsrc/conductor/db_rdf_objects.vspx +++ b/binsrc/conductor/db_rdf_objects.vspx @@ -80,7 +80,7 @@ diff --git a/binsrc/conductor/db_rdf_owl.vspx b/binsrc/conductor/db_rdf_owl.vspx index 3127375d53..6c77409d21 100644 --- a/binsrc/conductor/db_rdf_owl.vspx +++ b/binsrc/conductor/db_rdf_owl.vspx @@ -140,7 +140,7 @@ if (self.cr_vd_cb.ufl_selected) arr := sql_split_text (self.vds); res := make_array (1 + length (arr), 'any'); - gr := sprintf ('http://%s/schemas/%s#', cfg_item_value(virtuoso_ini_path(), 'URIQA','DefaultHost'), self.base_url); + gr := sprintf ('http://%s/schemas/%s#', virtuoso_ini_item_value ('URIQA','DefaultHost'), self.base_url); stat := '00000'; msg := 'OK'; exec ('DB.DBA.TTLP (?, \'\', ?)', stat, msg, vector (self.body_v, gr), 0, meta, data); diff --git a/binsrc/conductor/db_rdf_view_3.vspx b/binsrc/conductor/db_rdf_view_3.vspx index 116c978824..cf9a371be3 100644 --- a/binsrc/conductor/db_rdf_view_3.vspx +++ b/binsrc/conductor/db_rdf_view_3.vspx @@ -116,7 +116,7 @@ DB.DBA.YACUTIA_DAV_DELETE (path, 1, 0); DB.DBA.YACUTIA_DAV_COL_CREATE('/DAV/temp/', '110110000NN', 'dav', 'administrators'); DB.DBA.YACUTIA_DAV_RES_UPLOAD (path, self.body_o, '', '110110000NN', 'dav', 'administrators', now(), now(), null); - gr := sprintf ('http://%s/schemas/%s#', cfg_item_value(virtuoso_ini_path(), 'URIQA','DefaultHost'), self.base_url); + gr := sprintf ('http://%s/schemas/%s#', virtuoso_ini_item_value ('URIQA','DefaultHost'), self.base_url); stat := '00000'; msg := 'OK'; sparql clear graph iri (?:gr); @@ -309,7 +309,7 @@ + @@ -112,7 +113,7 @@
Base URL - +
- + - + + + + + - +
Host & Domain Name @@ -125,7 +126,16 @@
Listening Interface + + + +
@@ -151,7 +161,7 @@
TCP Port + sql="select distinct HP_HOST, HP_LISTEN_HOST, (case HP_LISTEN_HOST when '*ini*' then 0 when '*sslini*' then 0 when (':' || virtuoso_ini_item_value ('HTTPServer', 'SSLPort')) then 0 else 1 end) as HP_NO_EDIT from DB.DBA.HTTP_PATH order by HP_HOST, HP_LISTEN_HOST"> @@ -57,11 +57,11 @@ host_toshow := '0.0.0.0'; if(subseq( rowset[0], 0, strchr(rowset[0],':') ) = '*ini*') { httphost_toshow := '{Default Web Site}'; - port_toshow := cfg_item_value (virtuoso_ini_path(), 'HTTPServer', 'ServerPort'); + port_toshow := virtuoso_ini_item_value ('HTTPServer', 'ServerPort'); } else { httphost_toshow := '{Default SSL Web Site}'; - port_toshow := cfg_item_value (virtuoso_ini_path(), 'HTTPServer', 'SSLPort'); + port_toshow := virtuoso_ini_item_value ('HTTPServer', 'SSLPort'); } } else { diff --git a/binsrc/conductor/iengine.vspx b/binsrc/conductor/iengine.vspx index b3bc2c2023..9a4df31f70 100644 --- a/binsrc/conductor/iengine.vspx +++ b/binsrc/conductor/iengine.vspx @@ -418,7 +418,7 @@ diff --git a/binsrc/conductor/inifile.vspx b/binsrc/conductor/inifile.vspx index 4b6092fb81..e1c9bac542 100644 --- a/binsrc/conductor/inifile.vspx +++ b/binsrc/conductor/inifile.vspx @@ -109,7 +109,7 @@ for (j := 0; j < self.items; j := j + 1) { item := cfg_item_name (virtuoso_ini_path(), self.sect, j); - item_value := cfg_item_value (virtuoso_ini_path(), self.sect, item); + item_value := virtuoso_ini_item_value (self.sect, item); http (''); if ((self.sect = 'Parameters') and (item in ('AllowOSCalls', 'SafeExecutables', 'DbaExecutables', 'DirsAllowed', 'DirsDenied'))) { @@ -154,7 +154,7 @@ if (new_item <> item) cfg_write (virtuoso_ini_path(), self.sect, item, ''); - item_value := cfg_item_value (virtuoso_ini_path(), self.sect, item); + item_value := virtuoso_ini_item_value (self.sect, item); if (new_item_value <> item_value) cfg_write (virtuoso_ini_path(), self.sect, new_item, new_item_value); } diff --git a/binsrc/conductor/logging_view.vspx b/binsrc/conductor/logging_view.vspx index 93473a9947..62df4f19c7 100644 --- a/binsrc/conductor/logging_view.vspx +++ b/binsrc/conductor/logging_view.vspx @@ -37,7 +37,7 @@ declare v_params any; v_params := control.vc_page.vc_event.ve_params; - self.log_file := cfg_item_value(virtuoso_ini_path(), 'Database', 'ErrorLogFile'); + self.log_file := virtuoso_ini_item_value ('Database', 'ErrorLogFile'); self.dday := sprintf ('%02d', dayofmonth (now())); self.dmon := sprintf ('%03.03s', monthname (now())); self.dyear := sprintf ('%04d', year (now())); diff --git a/binsrc/conductor/mkvad.ini b/binsrc/conductor/mkvad.ini deleted file mode 100644 index c821f9d59f..0000000000 --- a/binsrc/conductor/mkvad.ini +++ /dev/null @@ -1,47 +0,0 @@ -; -; mkvad.ini -; -; $Id$ -; -; Configuration file for the creation of the demo database -; - -[Database] -DatabaseFile = vad.db -TransactionFile = vad.trx -ErrorLogFile = vad.log -ErrorLogLevel = 4 -FileExtend = 200 -Striping = 0 -Syslog = 0 - -[Parameters] -ServerPort = 1112 -ServerThreads = 100 -CheckpointInterval = 60 -NumberOfBuffers = 500 -MaxDirtyBuffers = 400 -MaxCheckpointRemap = 2000 -UnremapQuota = 0 -AtomicDive = 1 -PrefixResultNames = 0 -CaseMode = 2 -DirsAllowed = /, c:\ -SQLOptimizer = 1 - -[HTTPServer] -ServerPort = 1113 -[AutoRepair] -BadParentLinks = 0 -BadDTP = 0 - -[Client] -SQL_QUERY_TIMEOUT = 0 -SQL_TXN_TIMEOUT = 0 -SQL_PREFETCH_ROWS = 100 -SQL_PREFETCH_BYTES = 16000 - -[Replication] -ServerName = vadserver -ServerEnable = 1 -QueueMax = 50000 diff --git a/binsrc/conductor/mkvad.sh b/binsrc/conductor/mkvad.sh deleted file mode 100755 index 3b794faa71..0000000000 --- a/binsrc/conductor/mkvad.sh +++ /dev/null @@ -1,530 +0,0 @@ -#!/bin/bash -# -# mkvad.sh -# -# Creates a vad package for Virtuoso Conductor -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2024 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# - -# ---------------------------------------------------------------------- -# Fix issues with LOCALE -# ---------------------------------------------------------------------- -LANG=C -LC_ALL=POSIX -export LANG LC_ALL - - -PORT=${PORT-1112} -_HTTPPORT=`expr $PORT + 10` -HTTPPORT=${HTTPPORT-$_HTTPPORT} -#PORT=1311 -#HTTPPORT=8311 -PACKDATE=`date +"%Y-%m-%d %H:%M"` -SERVER=${SERVER-} -HOST=${HOST-localhost} -STICKER_DAV="vad_dav.xml" -STICKER_FS="vad_fs.xml" -NEED_VERSION=05.09.3037 -ISQL=${ISQL-isql} - -DSN="$HOST:$PORT" -LOGFILE=mkvad.output -DEMO=`pwd` -export DEMO LOGFILE -SILENT=${SILENT-0} -MAKEDOCS=${MAKEDOCS-0} -HTMLDOCS=${HTMLDOCS-1} -HOST_OS=`uname -s | grep WIN` -if [ "x$HOST_OS" != "x" ] -then -TEMPFILE="`cygpath -m $TMP/isql.$$`" -if [ "x$SRC" != "x" ] -then -HOME=$SRC -else -HOME="`cygpath -m $HOME`" -fi -LN="cp -rf" -RM="rm -rf" -else -TEMPFILE=/tmp/isql.$$ -LN="ln -fs" -RM="rm -f" -fi -VOS=0 -if [ -f ../../autogen.sh ] -then - VOS=1 -fi - -if [ "z$SERVER" = "z" ] -then - if [ "x$HOST_OS" != "x" ] - then - SERVER=virtuoso-odbc-t.exe - else - SERVER=virtuoso - fi -fi - -#============================================================================== -# Standard functions -#============================================================================== - -ECHO() -{ - echo "$*" | tee -a $DEMO/$LOGFILE -} - - -RUN() -{ - echo "+ $*" >> $DEMO/$LOGFILE - - STATUS=1 - if test $SILENT -eq 1 - then - eval $* >> $DEMO/$LOGFILE 2>/dev/null - else - eval $* >> $DEMO/$LOGFILE - fi - STATUS=$? -} - - -LINE() -{ - ECHO "=====================================================================" -} - - -BREAK() -{ - ECHO "" - ECHO "---------------------------------------------------------------------" - ECHO "" -} - - -BANNER() -{ - ECHO "" - LINE - ECHO "= $*" - ECHO "= " `date` - LINE - ECHO "" -} - -LOG() -{ - if test $SILENT -eq 1 - then - echo "$*" >> $LOGFILE - else - echo "$*" | tee -a $LOGFILE - fi -} - - -START_SERVER() -{ - timeout=120 - - ECHO "Starting Virtuoso server ..." - if [ "z$HOST_OS" != "z" ] - then - "$SERVER" +foreground & - - starth=`date | cut -f 2 -d :` - starts=`date | cut -f 3 -d :|cut -f 1 -d " "` - - while true - do - sleep 6 - if (netstat -an | grep "[\.\:]$PORT" | grep LISTEN > /dev/null) - then - break - fi - nowh=`date | cut -f 2 -d :` - nows=`date | cut -f 3 -d : | cut -f 1 -d " "` - - nowh=`expr $nowh - $starth` - nows=`expr $nows - $starts` - - nows=`expr $nows + $nowh \* 60` - if test $nows -ge $timeout - then - ECHO "***FAILED: Could not start Virtuoso Server within $timeout seconds" - exit 1 - fi - done - else - "$SERVER" +wait - if test $? -ne 0 - then - ECHO "***FAILED: Could not start Virtuoso Server" - exit 1 - fi - fi - - ECHO "Virtuoso server started" - return 0 -} - - -STOP_SERVER() -{ - $ISQL $DSN dba dba '"EXEC=raw_exit();"' VERBOSE=OFF PROMPT=OFF ERRORS=STDOUT >> $LOGFILE -} - - -DO_COMMAND() -{ - command=$1 - uid=${2-dba} - passwd=${3-dba} - $ISQL $DSN $uid $passwd ERRORS=stdout VERBOSE=OFF PROMPT=OFF "EXEC=$command" >> "${LOGFILE}.tmp" - if test $? -ne 0 - then - cat "${LOGFILE}.tmp" >> $LOGFILE - LOG "***FAILED: starting $command" - else - if egrep '^\*\*\*' "${LOGFILE}.tmp" > /dev/null - then - LOG "***FAILED: execution of $command" - msg=`cat ${LOGFILE}.tmp` - echo "------------ SQL ERROR -------------" - echo "$msg" - echo "------------------------------------" - echo "------------ SQL ERROR -------------" >> $LOGFILE - echo "$msg" >> $LOGFILE - echo "------------------------------------" >> $LOGFILE - else - LOG "PASSED: $command" - fi - fi - rm "${LOGFILE}.tmp" 2>/dev/null -} - - -CHECK_LOG() -{ - passed=`cat $DEMO/$LOGFILE | cut -b -200 | grep "PASSED:" | wc -l` - failed=`cat $DEMO/$LOGFILE | cut -b -200 | grep "\*\*\*.*FAILED:" | wc -l` - aborted=`cat $DEMO/$LOGFILE | cut -b -200 | grep "\*\*\*.*ABORTED:" | wc -l` - - ECHO "" - LINE - ECHO "= Checking log file $LOGFILE for statistics:" - ECHO "=" - ECHO "= Total number of tests PASSED : $passed" - ECHO "= Total number of tests FAILED : $failed" - ECHO "= Total number of tests ABORTED : $aborted" - LINE - ECHO "" - - if (expr $failed + $aborted \> 0 > /dev/null) - then - ECHO "*** Not all tests completed successfully" - ECHO "*** Check the file $LOGFILE for more information" - fi -} - - -LOAD_SQL() -{ - sql=$1 - uid=${2-dba} - passwd=${3-dba} - - RUN $ISQL $DSN $uid $passwd ERRORS=stdout VERBOSE=OFF PROMPT=OFF $sql - if test $? -ne 0 - then - ECHO "***FAILED: LOAD $sql" - else - ECHO "PASSED: LOAD $sql" - fi -} - -VERSION_INIT() -{ - if [ -f vad_version ] - then - VERSION=`cat vad_version` - else - LOG "The vad_version does not exist, please verify your checkout" - exit 1 - fi -} - -CREATE_STICKER() -{ - ISDAV=$1 - if [ "$ISDAV" = "1" ] ; then - BASE_PATH="/DAV/VAD" - TYPE="dav" - XDDLSQL="xddl_dav.sql" - STICKER=$STICKER_DAV - else - BASE_PATH="/vad/vsp" - TYPE="http" - STICKER=$STICKER_FS - XDDLSQL="xddl_filesystem.sql" - fi -LOG "VAD Sticker $STICKER creation..." -echo "" > $STICKER -echo "" >> $STICKER -echo "" >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " if (lt (sys_stat ('st_dbms_ver'), '$NEED_VERSION'))" >> $STICKER -echo " {" >> $STICKER -echo " result ('ERROR', 'The conductor package requires server version $NEED_VERSION or greater');" >> $STICKER -echo " signal ('FATAL', 'The conductor package requires server version $NEED_VERSION or greater');" >> $STICKER -echo " }" >> $STICKER -echo " if (coalesce ((select 1 from DB.DBA.SYS_COLS where \"TABLE\" = 'WS.WS.SYS_DAV_COL' and \"COLUMN\" = 'COL_FULL_PATH'), 0) = 0)" >> $STICKER -echo " {" >> $STICKER -echo " result ('ERROR', 'Please update server version');" >> $STICKER -echo " signal ('FATAL', 'Please update server version');" >> $STICKER -echo " }" >> $STICKER -echo " if ((__proc_exists ('DB.DBA.WebDAV_DAV_AUTHENTICATE') is not null) and (__proc_exists ('DB.DBA.WebDAV_VERIFY') is null))" >> $STICKER -echo " {" >> $STICKER -echo " result ('ERROR', 'Please install the last Briefcase VAD packages');" >> $STICKER -echo " signal ('FATAL', 'Please install the last Briefcase VAD packages');" >> $STICKER -echo " }" >> $STICKER -echo " if ((__proc_exists ('DB.DBA.oMail_DAV_AUTHENTICATE') is not null) and (__proc_exists ('DB.DBA.oMail_CONFIGURE') is null))" >> $STICKER -echo " {" >> $STICKER -echo " result ('ERROR', 'Please install the last WebMail VAD packages');" >> $STICKER -echo " signal ('FATAL', 'Please install the last WebMail VAD packages');" >> $STICKER -echo " }" >> $STICKER -echo " if (equ ($ISDAV, 0) and isinteger (file_stat (http_root ())))" >> $STICKER -echo " {" >> $STICKER -echo " result ('ERROR', 'Please setup [HTTPServer] ServerRoot INI setting properly');" >> $STICKER -echo " signal ('FATAL', 'Please setup [HTTPServer] ServerRoot INI setting properly');" >> $STICKER -echo " }" >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " registry_set('__no_vspx_temp', '1');" >> $STICKER -#echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/admin_dav_browser.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/sql/vdir_helper.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/sql/yacutia.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/sql/acme.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/dav/dav_browser.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"WEBDAV\".\"DBA\".\"xsl_upload\"($ISDAV);" >> $STICKER -echo " vhost_remove (lpath=>'/conductor');" >> $STICKER -echo " vhost_remove (lpath=>'/vspx');" >> $STICKER -echo " vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor');" >> $STICKER -echo " vhost_define (lpath=>'/conductor',ppath=>'$BASE_PATH/conductor/', is_dav=>$ISDAV, vsp_user=>'dba', is_brws=>0, def_page=>'main_tabs.vspx');" >> $STICKER -echo " vhost_define (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor',ppath=>'$BASE_PATH/conductor/', is_dav=>$ISDAV, vsp_user=>'dba', is_brws=>0, def_page=>'main_tabs.vspx');" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/sql/xddl.sql', 1, 'report', $ISDAV);" >> $STICKER -echo " \"DB\".\"DBA\".\"VAD_LOAD_SQL_FILE\"('$BASE_PATH/conductor/sql/$XDDLSQL', 1, 'report', $ISDAV);" >> $STICKER -echo " if ($ISDAV = 1) " >> $STICKER -echo " { " >> $STICKER -echo " for (select RES_FULL_PATH as X from WS.WS.SYS_DAV_RES where RES_FULL_PATH like '/DAV/VAD/conductor/%.xsl') do " >> $STICKER -echo " { " >> $STICKER -echo " DB.DBA.DAV_PROP_SET_INT (X, ':getlastmodified', now (), null, null, 0, auth_uid=>http_dav_uid ()); " >> $STICKER -echo " xslt_stale ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || X); " >> $STICKER -echo " } " >> $STICKER -echo " } " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " vhost_remove (lpath=>'/conductor');" >> $STICKER -echo " vhost_remove (lpath=>'/vspx');" >> $STICKER -echo " vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/conductor');" >> $STICKER -echo " vhost_remove (lhost=>'*sslini*', vhost=>'*sslini*', lpath=>'/vspx');" >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER - - if [ "$ISDAV" = "1" ] - then - FLIST=`cat conductor.list | grep -v '\.\.'` - else - FLIST=`cat conductor.list` - fi - -for file in $FLIST -do - name=$file - case "$name" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac -echo " " >> $STICKER -done - - -for file in `find vad/vsp/conductor/toolkit -type f -print | grep -v CVS | sort | cut -b9- ` -do - name=$file - case "$name" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac -echo " " >> $STICKER -done - -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo "" >> $STICKER - -} - -#============================================================================== -# MAIN ROUTINE -#============================================================================== -rm -f conductor_dav.vad -rm -f conductor_filesystem.vad -rm -rf vad -rm -f $LOGFILE -rm -f vad.db vad.trx vad.log virtuoso.ini virtuoso.tdb - -BANNER "CREATING VAD PACKAGE FOR VIRTUOSO CONDUCTOR (mkvad.sh)" - -$ISQL -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: CONDUCTOR PACKAGING, isql is not available" - exit 1 -fi -$SERVER -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: CONDUCTOR PACKAGING, server is not available" - exit 1 -fi - -curpwd=`pwd` -cd $curpwd - -mkdir vad -mkdir vad/vsp -mkdir vad/vsp/conductor -mkdir vad/vsp/conductor/css -mkdir vad/vsp/conductor/dav -mkdir vad/vsp/conductor/dav/image -mkdir vad/vsp/conductor/dav/image/dav -mkdir vad/vsp/conductor/help -mkdir vad/vsp/conductor/images -mkdir vad/vsp/conductor/images/icons -mkdir vad/vsp/conductor/images/pager -mkdir vad/vsp/conductor/js -mkdir vad/vsp/conductor/syntax -mkdir vad/vsp/conductor/sql -mkdir vad/vsp/conductor/toolkit -mkdir vad/vsp/conductor/toolkit/images -mkdir vad/vsp/conductor/toolkit/styles - -cp -f $HOME/binsrc/xddl/xddl.xsd . -cp -f $HOME/binsrc/xddl/xddl_diff.xsl . -cp -f $HOME/binsrc/xddl/xddl_exec.xsl . -cp -f $HOME/binsrc/xddl/xddl_procs.xsd . -cp -f $HOME/binsrc/xddl/xddl_views.xsd . -cp -f $HOME/binsrc/xddl/xddl_tables.xsd . -cp -f $HOME/binsrc/xddl/xddl.sql vad/vsp/conductor/sql -cp -f $HOME/binsrc/xddl/xddl_dav.sql vad/vsp/conductor/sql -cp -f $HOME/binsrc/xddl/xddl_filesystem.sql vad/vsp/conductor/sql - -cp -f * vad/vsp/conductor -cp -f css/* vad/vsp/conductor/css -cp -f dav/* vad/vsp/conductor/dav -cp -f dav/image/* vad/vsp/conductor/dav/image -cp -f dav/image/dav/* vad/vsp/conductor/dav/image/dav -cp -f images/* vad/vsp/conductor/images -cp -f images/icons/* vad/vsp/conductor/images/icons -cp -f images/pager/* vad/vsp/conductor/images/pager -cp -f js/* vad/vsp/conductor/js -cp -f syntax/* vad/vsp/conductor/syntax -cp -f sql/* vad/vsp/conductor/sql -cp -f $HOME/binsrc/oat/toolkit/*.js vad/vsp/conductor/toolkit/. -cp -f $HOME/binsrc/oat/images/* vad/vsp/conductor/toolkit/images -cp -f $HOME/binsrc/oat/styles/* vad/vsp/conductor/toolkit/styles -cp -f $HOME/binsrc/vspx/vdir_helper.sql vad/vsp/conductor/sql -cp -f help/*.xml vad/vsp/conductor/help - -VERSION_INIT - -CREATE_STICKER 0 -CREATE_STICKER 1 - -cat mkvad.ini | sed -e "s/1112/$PORT/g" | sed -e "s/1113/$HTTPPORT/g" > virtuoso.ini -STOP_SERVER -START_SERVER - -#cd $HOME/binsrc/vad -# -# Load the VAD -# -#LOAD_SQL $HOME/binsrc/vad/vad.isql dba dba -cd $curpwd -DO_COMMAND "DB.DBA.VAD_PACK('$STICKER_DAV', '.', 'conductor_dav.vad')" dba dba -DO_COMMAND "DB.DBA.VAD_PACK('$STICKER_FS', '.', 'conductor_filesystem.vad')" dba dba - -# -# Checkpoint and shutdown the demo database -# -DO_COMMAND checkpoint -DO_COMMAND shutdown - -chmod 644 conductor_dav.vad -chmod 644 conductor_filesystem.vad - -# -# Show final results of run -# -CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" -if test $STATUS -eq 0 -then - rm -f *.vad - exit 1 -fi - -# -# Clean ups -# -rm -f vad.db vad.trx vad.log virtuoso.ini virtuoso.tdb virtuoso.pxa -rm -f xddl.xsd xddl_diff.xsl xddl_exec.xsl xddl_procs.xsd xddl_views.xsd xddl_tables.xsd -rm -rf vad - - -BANNER "COMPLETED VAD PACKAGING" -exit 0 diff --git a/binsrc/conductor/r2rml_import.vspx b/binsrc/conductor/r2rml_import.vspx index 1042f33f45..e4f7007137 100644 --- a/binsrc/conductor/r2rml_import.vspx +++ b/binsrc/conductor/r2rml_import.vspx @@ -81,7 +81,7 @@ diff --git a/binsrc/conductor/rdf_conf.vspx b/binsrc/conductor/rdf_conf.vspx index 84c379fd15..23fea16473 100644 --- a/binsrc/conductor/rdf_conf.vspx +++ b/binsrc/conductor/rdf_conf.vspx @@ -120,6 +120,7 @@
+ diff --git a/binsrc/conductor/sec_pki_2.vspx b/binsrc/conductor/sec_pki_2.vspx index da8ec3b422..e1bd6e26d7 100644 --- a/binsrc/conductor/sec_pki_2.vspx +++ b/binsrc/conductor/sec_pki_2.vspx @@ -37,6 +37,7 @@ + @@ -157,7 +158,7 @@
- +
" >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo " " >> $STICKER -echo "
Target Graph IRI * - +
Named Graph IRI* - +
- + - + + + + + - + - + @@ -91,7 +91,7 @@ 0 ) + if (virtuoso_ini_item_value ('HTTPServer','DefaultMailServer') <> 0 ) { ?> @@ -187,10 +187,10 @@ declare msg, aadr, smtp_server varchar; msg := 'Subject: Test message from Data Space Applications Default Site\r\nContent-Type: text/html\r\n'; msg := msg || '
\r\nYour SMTP server '; - if (self.s_def.ufl_selected and cfg_item_value(virtuoso_ini_path(), 'HTTPServer','DefaultMailServer') <> 0) + if (self.s_def.ufl_selected and virtuoso_ini_item_value ('HTTPServer','DefaultMailServer') <> 0) { - msg:= msg || cfg_item_value(virtuoso_ini_path(), 'HTTPServer','DefaultMailServer'); - smtp_server := cfg_item_value(virtuoso_ini_path(), 'HTTPServer','DefaultMailServer'); + msg:= msg || virtuoso_ini_item_value ('HTTPServer','DefaultMailServer'); + smtp_server := virtuoso_ini_item_value ('HTTPServer','DefaultMailServer'); } else { diff --git a/binsrc/conductor/soap_services_edit.vspx b/binsrc/conductor/soap_services_edit.vspx index 1b72f1c830..33534d3eff 100644 --- a/binsrc/conductor/soap_services_edit.vspx +++ b/binsrc/conductor/soap_services_edit.vspx @@ -1962,7 +1962,19 @@ } if (length (self.cors) > 0) { - self.global_opts := vector_concat (self.global_opts, vector('cors', self.cors, 'cors_restricted', self.cors_rej)); + declare temp_opts, pos any; + temp_opts := coalesce(self.global_opts, vector()); + pos := position ('cors', temp_opts); + if (pos > 0) + aset (temp_opts, pos, self.cors); + else + temp_opts := vector_concat (temp_opts, vector('cors', self.cors)); + pos := position ('cors_restricted', temp_opts); + if (pos > 0) + aset (temp_opts, pos, self.cors_rej); + else + temp_opts := vector_concat (temp_opts, vector('cors_restricted', self.cors_rej)); + self.global_opts := temp_opts; } commit work; if (exists (select 1 from DB.DBA.HTTP_PATH where HP_HOST = self._httphost and HP_LISTEN_HOST = self._host and HP_LPATH = self.lpath) ) diff --git a/binsrc/conductor/sparql_input.vspx b/binsrc/conductor/sparql_input.vspx index be5c49c490..bb08435384 100644 --- a/binsrc/conductor/sparql_input.vspx +++ b/binsrc/conductor/sparql_input.vspx @@ -119,7 +119,7 @@ diff --git a/binsrc/conductor/sql/yacutia.sql b/binsrc/conductor/sql/yacutia.sql index 5d8cfd6dd8..70bc35b094 100644 --- a/binsrc/conductor/sql/yacutia.sql +++ b/binsrc/conductor/sql/yacutia.sql @@ -1481,7 +1481,7 @@ create procedure "PUMP"."DBA"."GET_DSN" () returns varchar while ( nitems >= 0 ) { item := cfg_item_name(virtuoso_ini_path(), sect, nitems); if (equ(item,'ServerPort')) { - port := cfg_item_value(virtuoso_ini_path(), sect, item); + port := virtuoso_ini_item_value (sect, item); goto next; } nitems := nitems - 1; @@ -4318,7 +4318,7 @@ create procedure www_tree (in path any) HP_NO_EDIT := case HOST when '*ini*' then 0 when '*sslini*' then 0 else 1 end; HP_NO_CTRL := case LHOST when '*ini*' then 0 when '*sslini*' then 0 - when (':' || cfg_item_value (virtuoso_ini_path(), 'HTTPServer', 'SSLPort')) then 0 + when (':' || virtuoso_ini_item_value ('HTTPServer', 'SSLPort')) then 0 else 1 end; vhost := HOST; @@ -4329,13 +4329,13 @@ create procedure www_tree (in path any) if (vhost = '*ini*') { vhost := '{Default Web Site}'; - port := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'ServerPort'); + port := virtuoso_ini_item_value ('HTTPServer', 'ServerPort'); intf := '0.0.0.0'; } else if (vhost = '*sslini*') { vhost := '{Default SSL Web Site}'; - port := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'SSLPort'); + port := virtuoso_ini_item_value ('HTTPServer', 'SSLPort'); if (port is null) port := ''; intf := '0.0.0.0'; @@ -4347,9 +4347,9 @@ create procedure www_tree (in path any) if (intf = '' or intf = '*ini*' or intf = '*sslini*') { if (intf = '*ini*') - port := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'ServerPort'); + port := virtuoso_ini_item_value ('HTTPServer', 'ServerPort'); else if (intf = '*sslini*') - port := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'SSLPort'); + port := virtuoso_ini_item_value ('HTTPServer', 'SSLPort'); intf := '0.0.0.0'; } } @@ -4779,7 +4779,7 @@ create procedure y_check_host (in host varchar, in listen varchar, in port varch declare inihost, ihost, iport varchar; declare pos int; - inihost := cfg_item_value (virtuoso_ini_path (), 'HTTPServer', 'ServerPort'); + inihost := virtuoso_ini_item_value ('HTTPServer', 'ServerPort'); pos := strrchr (inihost, ':'); @@ -6279,10 +6279,17 @@ create procedure DB.DBA.LOCAL_CA_RENEW (in ca_key_name varchar := 'id_rsa', in d } ; -create procedure DB.DBA.HTTPS_MAKE_HOST_KEY (in cname varchar) +create procedure DB.DBA.HTTPS_MAKE_HOST_KEY (in cname varchar, in alt_names varchar := null) { - declare kname varchar; + declare kname, san varchar; declare serial int; + declare alt_hosts any; + alt_hosts := string_split (alt_names); + san := 'DNS:'||cname; + foreach (varchar cn in alt_hosts) do + { + san := concat (san, ', DNS:', cn); + } serial := deserialize (hex2bin('F700' || subseq (bin2hex (xenc_digest (uuid(), 'sha256')), 0, 14))); kname := 'https_key_' || replace (cname, '.', '_'); xenc_key_RSA_create (kname, 2048); @@ -6293,7 +6300,7 @@ create procedure DB.DBA.HTTPS_MAKE_HOST_KEY (in cname varchar) 'extendedKeyUsage', 'serverAuth', 'basicConstraints', 'critical,CA:FALSE', 'authorityKeyIdentifier', 'keyid,issuer:always', - 'subjectAltName', 'DNS:'||cname + 'subjectAltName', san )); USER_KEY_STORE (user, kname, 'X.509', 2, '', cast (xenc_pkcs12_export (kname, cname || ' key', '') as varchar)); return kname; diff --git a/binsrc/conductor/vad.vspx b/binsrc/conductor/vad.vspx index 97084e48fc..ae7fd8aae3 100644 --- a/binsrc/conductor/vad.vspx +++ b/binsrc/conductor/vad.vspx @@ -43,12 +43,14 @@ - self.src_folder := cfg_item_value (virtuoso_ini_path (), 'Parameters', 'VADInstallDir'); - if (self.src_folder is null) - self.src_folder := '../vad/'; - + declare vad_install_dir varchar; + vad_install_dir := virtuoso_ini_item_value ('Parameters', 'VADInstallDir'); + if (vad_install_dir is null) + vad_install_dir := '../vad/'; + if (vad_install_dir not like '%/') + vad_install_dir := concat (vad_install_dir, '/'); + self.src_folder := vad_install_dir; self.src_folder_type := 0; self.vc_data_bind (e); diff --git a/binsrc/conductor/vad_src.vspx b/binsrc/conductor/vad_src.vspx index 5296de3ffe..a1618d9a47 100644 --- a/binsrc/conductor/vad_src.vspx +++ b/binsrc/conductor/vad_src.vspx @@ -43,7 +43,7 @@ http_nobody_uid() and (http_dav_uid () <> coalesce (connection_get ('DAVBillingUserID'), -12)) and exists (select top 1 1 from SYS_USERS where U_ID = auth_uid and U_ACCOUNT_DISABLED = 1 )) return -42; - set isolation='serializable'; if (det is not null) { DAV_SEARCH_ID_OR_DET (par, 'R', det, detcol_id, detcol_path, unreached_path); diff --git a/binsrc/dav/uriqa.sql b/binsrc/dav/uriqa.sql index f9eb1d686d..eea00e1a00 100644 --- a/binsrc/dav/uriqa.sql +++ b/binsrc/dav/uriqa.sql @@ -36,10 +36,8 @@ create index URIQA_HANDLER_ORDER_NAME on WS.WS.URIQA_HANDLER (UH_ORDER, UH_NAME) create function WS.WS.URIQA_CFG_ITEM_VALUE (in param_name varchar, in is_list integer, in dflt_value varchar) { - declare ini_path varchar; declare string_val varchar; declare list_val any; - ini_path := virtuoso_ini_path (); string_val := virtuoso_ini_item_value ('URIQA', param_name); if (string_val is not null) { diff --git a/binsrc/dbpedia/.gitignore b/binsrc/dbpedia/.gitignore index 34abe1e228..745b2d4924 100644 --- a/binsrc/dbpedia/.gitignore +++ b/binsrc/dbpedia/.gitignore @@ -1,6 +1,4 @@ -dbpedia_dav.vad -dbpedia_filesystem.vad -make_dbpedia_vad.log +*.vad +*.log vad_dav.xml vad_fs.xml -virtuoso.pxa diff --git a/binsrc/dbpedia/Makefile.am b/binsrc/dbpedia/Makefile.am index 66c8daa394..bdfaba575e 100644 --- a/binsrc/dbpedia/Makefile.am +++ b/binsrc/dbpedia/Makefile.am @@ -1,23 +1,23 @@ -# +# # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. -# +# # Copyright (C) 1998-2024 OpenLink Software -# +# # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; only version 2 of the License, dated June 1991. -# +# # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# +# +# TOP=@TOP@ @@ -25,7 +25,31 @@ if WITH_DBPEDIA_VAD nodist_vad_DATA = dbpedia_dav.vad endif -noinst_SCRIPTS = make_vad.sh +NEED_VERSION = 07.20.3226 +STICKER = dbpedia_sticker.xml +VERBOSE = #--verbose +VERSION = `cat vad_version` + +DAV_FLAGS = $(VERBOSE) \ + --prefix "$(srcdir)" \ + --var="BASE_PATH=/DAV/VAD" \ + --var="ISDAV=1" \ + --var="NEED_VERSION=$(NEED_VERSION)" \ + --var="TYPE=dav" \ + --var="VERSION=$(VERSION)" + + +dbpedia_dav.vad: $(EXTRA_DIST) Makefile + $(PYTHON) $(top_srcdir)/binsrc/vadpacker/vadpacker.py \ + -o $(builddir)/dbpedia_dav.vad \ + $(DAV_FLAGS) \ + $(srcdir)/$(STICKER) + +# ---------------------------------------------------------------------- +# +# Cleanup +# +# ---------------------------------------------------------------------- CLEANFILES = \ dbpedia_dav.vad \ dbpedia_filesystem.vad \ @@ -33,12 +57,9 @@ CLEANFILES = \ make_vad.output \ vad_dav.xml \ vad_fs.xml \ + vadpacker.log \ virtuoso.pxa - -dbpedia_filesystem.vad dbpedia_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost $(SHELL) ./make_vad.sh - clean-local: -rm -rf vad @@ -48,18 +69,13 @@ clean-local: # # ---------------------------------------------------------------------- EXTRA_DIST = \ - *.sql \ - make_vad.sh \ - vad_version \ - vsp/*.sql \ - vsp/*.vsp \ - vsp/statics/css/*.css \ - vsp/statics/fonts/*.eot \ - vsp/statics/fonts/*.svg \ - vsp/statics/fonts/*.ttf \ - vsp/statics/fonts/*.woff \ - vsp/statics/fonts/*.woff2 \ - vsp/statics/images/*.gif \ - vsp/statics/images/*.png \ - vsp/statics/images/*.svg \ - vsp/statics/js/*.js + $(srcdir)/$(STICKER) \ + $(srcdir)/css/*.css \ + $(srcdir)/fonts/*.* \ + $(srcdir)/images/*.gif \ + $(srcdir)/images/*.png \ + $(srcdir)/images/*.svg \ + $(srcdir)/js/*.js \ + $(srcdir)/sql/*.sql \ + $(srcdir)/vad_version \ + $(srcdir)/vsp/*.vsp diff --git a/binsrc/dbpedia/vsp/statics/css/bootstrap.min.css b/binsrc/dbpedia/css/bootstrap.min.css similarity index 100% rename from binsrc/dbpedia/vsp/statics/css/bootstrap.min.css rename to binsrc/dbpedia/css/bootstrap.min.css diff --git a/binsrc/dbpedia/vsp/statics/css/dbpedia.css b/binsrc/dbpedia/css/dbpedia.css similarity index 100% rename from binsrc/dbpedia/vsp/statics/css/dbpedia.css rename to binsrc/dbpedia/css/dbpedia.css diff --git a/binsrc/dbpedia/dbpedia_init.sql b/binsrc/dbpedia/dbpedia_init.sql deleted file mode 100644 index d47a95e080..0000000000 --- a/binsrc/dbpedia/dbpedia_init.sql +++ /dev/null @@ -1,735 +0,0 @@ --- --- $Id$ --- --- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) --- project. --- --- Copyright (C) 1998-2024 OpenLink Software --- --- This project is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the --- Free Software Foundation; only version 2 of the License, dated June 1991. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- General Public License for more details. --- --- You should have received a copy of the GNU General Public License along --- with this program; if not, write to the Free Software Foundation, Inc., --- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --- --- - -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>registry_get('_dbpedia_path_')); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/class'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/ontology'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data2'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data3'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/page'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/resource'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/category'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/statics'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/wikicompany/resource'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/sparql'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/property'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data4'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/about'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/snorql'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/sparql-auth'); - - ---# root proxy to dbpedia wiki -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/', - ppath=>registry_get ('dbp_website'), - is_dav=>0, - def_page=>'' -); - -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>rtrim (registry_get('_dbpedia_path_'), '/'), - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba' -); - ---# class -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/class', - ppath=>'/', - is_dav=>0, - def_page=>'', - opts=>vector ('url_rewrite', 'dbp_rule_list_3') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_3', 1, vector ('dbp_rule_6', 'dbp_rule_7', 'dbp_rule_18', 'dbp_rule_19')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_6', 1, '(/[^#]*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 2, 0, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_7', 1, '/class/(.*)\x24', vector ('par_1'), 1, -'/data2/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_18', 1, '/class/(.*)\x24', vector ('par_1'), 1, -'/data2/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 2, 303, 'Content-Type: text/rdf+n3'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_19', 1, '/class/(.*)\x24', vector ('par_1'), 1, -'/data2/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); - ---# ontology -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/ontology', - ppath=>'/', - is_dav=>0, - def_page=>'', - opts=>vector ('url_rewrite', 'dbp_rule_list_owl') -); - - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_owl', 1, vector ('owl_rule_6', 'owl_rule_7', 'owl_rule_18', 'owl_rule_19')); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'owl_rule_6', 1, '(/[^#]*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 2, 0, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'owl_rule_7', 1, '/ontology/(.*)\x24', vector ('par_1'), 1, -'/data3/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'owl_rule_18', 1, '/ontology/(.*)\x24', vector ('par_1'), 1, -'/data3/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 2, 303, 'Content-Type: text/rdf+n3'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'owl_rule_19', 1, '/ontology/(.*)\x24', vector ('par_1'), 1, -'/data3/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); - - ---# data -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data', - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba', - opts=>vector ('url_rewrite', 'dbp_data_rule_list', 'url_rewrite_keep_lpath', 1) -); - -create procedure DB.DBA.DBP_GRAPH_PARAM1 (in par varchar, in fmt varchar, in val varchar) -{ - declare tmp any; - tmp := sprintf ('default-graph-uri=%U', registry_get ('dbp_graph')); - if (par = 'gr') - { - val := trim (val, '/'); - if (length (val) = 0) - val := ''; - if (val = 'en') - val := ''; - if (val <> '') - { - val := 'http://' || val || '.dbpedia.org'; - tmp := tmp || sprintf ('&named-graph-uri=%U', val); - } - } - else - tmp := val; - return sprintf (fmt, tmp); -} -; - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_data_rule_list', 1, vector ('dbp_data_rule0', 'dbp_data_rule1', 'dbp_data_rule2', 'dbp_data_rule3', 'dbp_data_rule3-1', 'dbp_data_rule3-2', 'dbp_data_rule4', 'dbp_data_rule5', 'dbp_data_rule6', 'dbp_data_rule7', 'dbp_data_rule8')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule0', 1, '/data/([a-z_\\-]*/)?(.*)', vector ('gr', 'par_1'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=rdf', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule1', 1, '/data/([a-z_\\-]*/)?(.*)', vector ('gr', 'par_1'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=%U', -vector ('gr', 'par_1', '*accept*'), 'DB.DBA.DBP_GRAPH_PARAM1', '(application/rdf.xml)|(text/rdf.n3)', 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule2', 1, '/data/([a-z_\\-]*/)?(.*)\\.(xml)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=rdf', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule3', 1, '/data/([a-z_\\-]*/)?(.*)\\.(ttl)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=n3', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule3-1', 1, '/data/([a-z_\\-]*/)?(.*)\\.(nt)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=n3', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule3-2', 1, '/data/([a-z_\\-]*/)?(.*)\\.(n3)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=text%%2Fn3', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule5', 1, '/data/([a-z_\\-]*/)?(.*)\\.(jrdf)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&output=application%%2Frdf%%2Bjson', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, 'Content-Type: application/rdf+json\r\n^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule6', 1, '/data/([a-z_\\-]*/)?(.*)\\.(json)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&output=application%%2Fjson', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, 'Content-Type: application/json\r\n^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule4', 1, '/data/([a-z_\\-]*/)?(.*)\\.(rdf)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=define+sql:describe-mode+"DBPEDIA"+DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&format=%U', -vector ('gr', 'par_1', 'f'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule7', 1, '/data/([a-z_\\-]*/)?(.*)\\.(atom)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&output=application%%2Fatom%%2Bxml', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, 'Content-Type: application/atom+xml\r\n^{sql:DB.DBA.DBP_LINK_HDR}^'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_data_rule7', 1, '/data/([a-z_\\-]*/)?(.*)\\.(jsod)', vector ('gr', 'par_1', 'f'), 1, -'/sparql?%s&query=DESCRIBE+%%3Chttp%%3A%%2F%%2F'||replace(registry_get('dbp_domain'),'http://','')||'%%2Fresource%%2F%s%%3E&output=application%%2Fodata%%2Bjson', -vector ('gr', 'par_1'), 'DB.DBA.DBP_GRAPH_PARAM1', NULL, 2, null, 'Content-Type: application/odata+json\r\n^{sql:DB.DBA.DBP_LINK_HDR}^'); - ---# data2 -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data2', - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba', - opts=>vector ('url_rewrite', 'pvsp_rule_list7') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'pvsp_rule_list7', 1, vector ('pvsp_data_rule7')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'pvsp_data_rule7', 1, '/data2/(.*)\\.(n3|rdf)', vector ('par_1','f'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fclass%%2F%U%%3E&format=%U', -vector ('par_1', 'f'), NULL, NULL, 2, null, ''); - ---# data3 -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data3', - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba', - opts=>vector ('url_rewrite', 'pvsp_rule_data3') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'pvsp_rule_data3', 1, vector ('pvsp_data3_rule', 'pvsp_data3_rule_2', 'pvsp_data3_rule_3')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'pvsp_data3_rule', 1, '/data3/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'f'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fontology%%2F%U%%3E&format=%U', -vector ('par_1', 'f'), NULL, NULL, 2, NULL, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'pvsp_data3_rule_2', 1, '/data3/(.*)\\.(atom)', vector ('par_1', 'f'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fontology%%2F%U%%3E&format=application%%2Fatom%%2Bxml', -vector ('par_1'), NULL, NULL, 2, NULL, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'pvsp_data3_rule', 1, '/data3/(.*)\\.(ntriples)', vector ('par_1', 'f'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fontology%%2F%U%%3E&format=text%%2Fplain', -vector ('par_1'), NULL, NULL, 2, NULL, ''); - ---# page -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/page', - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - opts=>vector ('url_rewrite', 'dbp_rule_list_7') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_7', 1, vector ('dbp_rule_13')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_13', 1, '(/[^#\\?]*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 0, 0, ''); - ---# resource -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/resource', - ppath=>'/', - is_dav=>0, - def_page=>'', - opts=>vector ('url_rewrite', 'dbp_rule_list_2') -); - -create procedure DB.DBA.DBP_LINK_HDR (in in_path varchar) -{ - declare host, lines, accept, loc, alt, exp, lic any; - lines := http_request_header (); --- dbg_obj_print ('in_path: ', in_path); --- dbg_obj_print ('lines: ', lines); - loc := ''; alt := ''; exp := ''; - host := http_request_header(lines, 'Host', null, ''); - if (regexp_match ('/data/([a-z_\\-]*/)?(.*)\\.(nt|n3|rdf|ttl|jrdf|jsonld|xml|atom|json|jsod|ntriples)', in_path) is null and in_path like '/data/%') - { - declare tmp any; - accept := http_request_header(lines, 'Accept', null, 'application/rdf+xml'); - accept := regexp_match ('(application/rdf.xml)|(text/rdf.n3)|(text/n3)', accept); - tmp := split_and_decode (in_path, 0, '\0\0/'); - if (length (tmp) and strstr (http_header_get (), 'Content-Location') is null) - { - tmp := tmp [ length (tmp) - 1 ]; - if (accept is null) - accept := 'application/rdf+xml'; - if (accept = 'application/rdf+xml') - loc := 'Content-Location: ' || tmp || '.xml\r\n'; - else if (accept = 'text/rdf+n3') - loc := 'Content-Location: ' || tmp || '.n3\r\n'; - else if (accept = 'text/n3') - loc := 'Content-Location: ' || tmp || '.n3\r\n'; - } - } - if (in_path like '/data/%') - { - declare ext any; - declare p varchar; - ext := vector (vector ('xml', 'RDF/XML', 'application/rdf+xml'), vector ('n3', 'N3/Turtle', 'text/n3'), vector ('json', 'RDF/JSON', 'application/json')); - foreach (any ss in ext) do - { - declare s varchar; - s := ss[0]; - if (in_path not like '/data/%.'||s) - { - p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|atom|jsod|jsonld|ntriples)\x24', '.'||s); - alt := alt || sprintf ('; rel="alternate"; type="%s"; title="Structured Descriptor Document (%s format)", ', host, p, ss[2], ss[1]); - } - } - if (in_path not like '/data/%.atom') - { - p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', '.atom'); - alt := alt || sprintf ('; rel="alternate"; type="application/atom+xml"; title="OData (Atom+Feed format)", ', host, p); - } - if (in_path not like '/data/%.jsod') - { - p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', '.jsod'); - alt := alt || sprintf ('; rel="alternate"; type="application/odata+json"; title="OData (JSON format)", ', host, p); - } - p := regexp_replace (in_path, '\\.(n3|nt|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', ''); - p := replace (p, '/data/', '/page/'); - alt := alt || sprintf ('; rel="alternate"; type="text/html"; title="XHTML+RDFa", ', host, p); - p := replace (p, '/page/', '/resource/'); - if (in_path not like '/resource/%') - { - alt := alt || sprintf ('; rel="http://xmlns.com/foaf/0.1/primaryTopic", ', host, p); - alt := alt || sprintf ('; rev="describedby", ', host, p); - } - else - { - alt := alt || sprintf ('; rev="http://xmlns.com/foaf/0.1/primaryTopic", ', host, p); - alt := alt || sprintf ('; rel="describedby", ', host, p); - } - if (registry_get ('dbp_pshb_hub') <> 0) - alt := alt || sprintf ('<%s>; rel="hub", ', registry_get ('dbp_pshb_hub')); - exp := sprintf ('Expires: %s\r\n', date_rfc1123 (dateadd ('day', 7, now ()))); - } - lic := ';rel="license",'; - return sprintf ('%s%sLink: %s%s; rel="timegate"', exp, loc, lic, alt, host, in_path); -} -; - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_2', 1, vector ('dbp_rule_14', 'dbp_rule_12')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_14', 1, '/resource/(.*)\x24', vector ('par_1'), 1, - '/page/%s', vector ('par_1'), NULL, NULL, 2, 303, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -create procedure DB.DBA.DBP_DATA_IRI1 (in par varchar, in fmt varchar, in val varchar) -{ - if (par = 'par_2' and length (val)) - { - declare arr any; - arr := split_and_decode (val); - if (length (arr) > 1 and arr[1] <> 'en' and length (arr[1])) - return sprintf (fmt, arr[1] || '/'); - val := ''; - } - return sprintf (fmt, val); -} -; -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_12', 1, '/resource/([^\\?]*)(\\?lang=.*)?\x24', vector ('par_1', 'par_2'), 1, - '/data/@__@%s', vector ('par_1'), 'DB.DBA.DBP_DATA_IRI1', - '(application/rdf.xml)|(text/rdf.n3)|(text/n3)|(application/x-turtle)|(application/rdf.json)|(application/json)|(application/atom.xml)|(application/odata.json)', 2, 303, '^{sql:DB.DBA.DBP_LINK_HDR}^'); - -create procedure DB.DBA.DBP_TCN_LOC (in id any, in var any) -{ - return var; -} -; - - -delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbp_rule_list_2'; -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.xml', 'application/rdf+xml', 0.95, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.n3', 'text/n3', 0.80, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.nt', 'text/rdf+n3', 0.80, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.ttl', 'application/x-turtle', 0.70, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.json', 'application/json', 0.60, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.jrdf', 'application/rdf+json', 0.60, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.atom', 'application/atom+xml', 0.50, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_2', '/data/@__@(.*)', '/data/\x241.jsod', 'application/odata+json', 0.50, location_hook=>null); - ---# category -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/category', - ppath=>'/', - is_dav=>0, - def_page=>'', - opts=>vector ('url_rewrite', 'dbp_rule_list_category') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_category', 1, vector ('dbp_rule_category14', 'dbp_rule_category12')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_category14', 1, '/category/(.*)\x24', vector ('par_1'), 1, - '/page/%s', vector ('par_1'), NULL, NULL, 2, 303, NULL); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_rule_category12', 1, '/category/(.*)\x24', vector ('par_1'), 1, - '/data/__%U', vector ('par_1'), NULL, '(application/rdf.xml)|(text/rdf.n3)|(application/x-turtle)|(application/rdf.json)|(application/json)', 2, 303); - -delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbp_rule_list_category'; -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_category', '__(.*)', '\x241.xml', 'application/rdf+xml', 0.95, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_category', '__(.*)', '\x241.n3', 'text/rdf+n3', 0.80, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_category', '__(.*)', '\x241.ttl', 'application/x-turtle', 0.70, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_category', '__(.*)', '\x241.json', 'application/json', 0.60, location_hook=>null); -DB.DBA.HTTP_VARIANT_ADD ('dbp_rule_list_category', '__(.*)', '\x241.jrdf', 'application/rdf+json', 0.60, location_hook=>null); - - ---# statics -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/statics', - ppath=>'/DAV/VAD/dbpedia/statics/', - is_dav=>1, - def_page=>'index.html' -); - ---# wikicompany -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/wikicompany/resource', - ppath=>'/DAV/wikicompany/resource/', - is_dav=>1, - vsp_user=>'dba', - opts=>vector ('url_rewrite', 'dbp_wc_rule_list1') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_wc_rule_list1', 1, vector ('dbp_wc_rule1', 'dbp_wc_rule2')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_wc_rule1', 1, '(/[^#]*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%s', vector ('par_1'), NULL, NULL, 2, 0, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbp_wc_rule2', 1, '(/[^#]*)', vector ('par_1'), 1, -'/sparql?query=describe%%20%%3Chttp%%3A%%2F%%2Fdbpedia.openlinksw.com%s%%3E%%20from%%20%%3Chttp%%3A%%2F%%2Fdbpedia.openlinksw.com%%2Fwikicompany%%3E&format=%U', -vector ('par_1', '*accept*'), NULL, '(application/rdf.xml)|(text/rdf.n3)', 2, 303, ''); - ---# sparql -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/sparql', - ppath=>'/!sparql/', - is_dav=>1, - def_page=>'', - vsp_user=>'dba', - opts=>vector ('noinherit', 'yes') -); - ---# property -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/property', - ppath=>'/', - is_dav=>0, - def_page=>'', - opts=>vector ('url_rewrite', 'dbp_rule_list_prop') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbp_rule_list_prop', 1, vector ('prop_rule_6', 'prop_rule_7', 'prop_rule_18', 'prop_rule_19')); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'prop_rule_6', 1, '(/[^#\\?]*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 0, 0, ''); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'prop_rule_7', 1, '/property/(.*)\x24', vector ('par_1'), 1, -'/data4/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'prop_rule_18', 1, '/property/(.*)\x24', vector ('par_1'), 1, -'/data4/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 1, 303, 'Content-Type: text/rdf+n3'); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'prop_rule_19', 1, '/property/(.*)\x24', vector ('par_1'), 1, -'/data4/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); - ---# data4 -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/data4', - ppath=>registry_get('_dbpedia_path_'), - is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba', - opts=>vector ('url_rewrite', 'pvsp_rule_data4') -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'pvsp_rule_data4', 1, vector ('pvsp_data4_rule')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'pvsp_data4_rule', 1, '/data4/(.*)\\.(n3|rdf)', vector ('par_1', 'f'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'&query=DESCRIBE+%%3Chttp%%3A%%2F%%2Fdbpedia.org%%2Fproperty%%2F%U%%3E&format=%U', -vector ('par_1', 'f'), NULL, NULL, 2, null, ''); - ---# about -DB.DBA.VHOST_DEFINE ( - lhost=>registry_get ('dbp_lhost'), - vhost=>registry_get ('dbp_vhost'), - lpath=>'/about', - ppath=>'/SOAP/Http/ext_http_proxy', - is_dav=>0, - soap_user=>'PROXY', - ses_vars=>0, - opts=>vector ('url_rewrite', 'ext_about_http_proxy_rule_list1'), - is_default_host=>0 -); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( - 'ext_about_http_proxy_rule_list1', 1, - vector ('dbp_about_rule_1')); - -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( - 'dbp_about_rule_1', 1, - '/about/html/(.*)\x24', - vector ('par_1'), - 1, - '/DAV/VAD/dbpedia/description.vsp?res=%U', - vector ('par_1'), - NULL, - NULL, - 2, - 0, - '' - ); - -DB.DBA.VHOST_REMOVE ( - lhost=>registry_get ('dbp_lhost'), - vhost=>registry_get ('dbp_vhost'), - lpath=>'/rdfdesc'); -DB.DBA.VHOST_DEFINE ( - lhost=>registry_get ('dbp_lhost'), - vhost=>registry_get ('dbp_vhost'), - lpath=>'/rdfdesc', - ppath=>'/DAV/VAD/rdf_mappers/rdfdesc/', - is_dav=>1, - vsp_user=>'dba', - ses_vars=>0, - is_default_host=>0 -); - ---# snorql -DB.DBA.VHOST_DEFINE ( - lhost=>registry_get ('dbp_lhost'), - vhost=>registry_get ('dbp_vhost'), - lpath=>'/snorql', - ppath=>'/snorql/', - is_dav=>0, - def_page=>'index.html', - vsp_user=>'dba', - ses_vars=>0, - opts=>vector ('browse_sheet', 0), - is_default_host=>0 -); - ---# sparql-auth -DB.DBA.VHOST_DEFINE ( - lhost=>registry_get ('dbp_lhost'), - vhost=>registry_get ('dbp_vhost'), - lpath=>'/sparql-auth', - ppath => '/!sparql/', - is_dav => 1, - vsp_user => 'dba', - opts => vector('noinherit', 1), - auth_fn=>'DB.DBA.HP_AUTH_SPARQL_USER', - realm=>'SPARQL', - sec=>'digest'); - ---# other init code - -create procedure ensure_demo_user () -{ - if (exists (select 1 from SYS_USERS where U_NAME = 'demo')) - return; - exec ('create user "demo"'); - DB.DBA.user_set_qualifier ('demo', 'Demo'); -}; - -ensure_demo_user (); - -drop procedure ensure_demo_user; - -create procedure create_demo_home () -{ - declare pwd any; - pwd := (select pwd_magic_calc (U_NAME, U_PASSWORD, 1) from SYS_USERS where U_NAME = 'dav'); - DAV_COL_CREATE ('/DAV/home/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); - DAV_COL_CREATE ('/DAV/home/demo/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); - DAV_COL_CREATE ('/DAV/home/demo/dbpedia/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); -}; - -create_demo_home (); -drop procedure create_demo_home; - -create procedure upload_isparql () -{ - declare base varchar; - declare pwd any; - pwd := (select pwd_magic_calc (U_NAME, U_PASSWORD, 1) from SYS_USERS where U_NAME = 'dav'); - base := registry_get('_dbpedia_path_'); - if (base like '/DAV/%') - { - for select RES_FULL_PATH from WS..SYS_DAV_RES where RES_FULL_PATH like base||'%.isparql' do - { - DAV_COPY (RES_FULL_PATH, '/DAV/home/demo/dbpedia/', 0, '111101101NN', 'dav', 'administrators', 'dav', pwd); - } - } - else - { - declare arr any; - arr := sys_dirlist (base); - foreach (varchar f in arr) do - { - if (f like '%.isparql') - DAV_RES_UPLOAD ('/DAV/home/demo/dbpedia/'||f, file_to_string (base||f), '', '110100100R', http_dav_uid(), http_dav_gid(), 'dav', pwd); - } - } - -- the current trigger of isparql have bug - update WS..SYS_DAV_RES set RES_PERMS = '110100100NN' where RES_FULL_PATH like '/DAV/home/demo/dbpedia/%'; -} -; - -upload_isparql (); -drop procedure upload_isparql; - - ---# void & iSPARQL non-default VDs -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void/data'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void/page'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql/view'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql/defaults'); - -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void', - ppath=>'/', - is_dav=>0, - def_page=>'', - ses_vars=>0, - opts=>vector ('url_rewrite', 'dbpl_void_rule_list'), - is_default_host=>0 -); - -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void/data', - ppath=>'/DAV/VAD/dbpedia/', - is_dav=>1, - vsp_user=>'dba', - ses_vars=>0, - opts=>vector ('url_rewrite', 'dbpl_void_data_rule_list'), - is_default_host=>0 -); - -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/void/page', - ppath=>'/DAV/VAD/dbpedia/', - is_dav=>1, - ses_vars=>0, - opts=>vector ('url_rewrite', 'dbpl_void_page_rule_list'), - is_default_host=>0 -); - -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql', - ppath=>'/DAV/VAD/iSPARQL/', - is_dav=>1, - def_page=>'index.html', - vsp_user=>'dba', - ses_vars=>0, - is_default_host=>0 -); -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql/view', - ppath=>'/DAV/VAD/iSPARQL/', - is_dav=>1, - def_page=>'execute.html', - vsp_user=>'dba', - ses_vars=>0, - is_default_host=>0 -); -DB.DBA.VHOST_DEFINE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/isparql/defaults', - ppath=>'/DAV/VAD/iSPARQL/', - is_dav=>1, - def_page=>'defaults.vsp', - vsp_user=>'dba', - ses_vars=>0, - is_default_host=>0 -); - -create procedure DB.DBA.SPARQL_DESC_DICT_DBPEDIA_PHYSICAL -(in subj_dict any, in consts any, in good_graphs any, in bad_graphs any, in storage_name any, in options any) -{ - declare res, subjs any; - res := DB.DBA.SPARQL_DESC_DICT (subj_dict, consts, good_graphs, bad_graphs, storage_name, options); - if (is_http_ctx ()) - { - subjs := dict_to_vector (subj_dict, 0); - for (declare i int, i := 0; i < length (subjs); i := i + 2) - { - declare s any; - s := subjs [i]; - dict_put (res, vector (iri_to_id (HTTP_URL_HANDLER ()), iri_to_id ('http://xmlns.com/foaf/0.1/primaryTopic'), s), 1); - dict_put (res, vector (iri_to_id (HTTP_URL_HANDLER ()), iri_to_id ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), iri_to_id ('http://xmlns.com/foaf/0.1/Document')), 1); - } - } - return res; -} -; - -grant execute on DB.DBA.SPARQL_DESC_DICT_DBPEDIA_PHYSICAL to "SPARQL_SELECT"; - ---# Facet browser on non-default vd -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/fct'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/fct/service'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/fct/soap'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/services/rdf/iriautocomplete.get'); -DB.DBA.VHOST_REMOVE ( lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), lpath=>'/describe'); - -DB.DBA.VHOST_DEFINE (lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), - lpath=>'/fct', ppath=>'/DAV/VAD/fct/', - is_dav=>1, def_page=>'facet.vsp', vsp_user=>'dba', ses_vars=>0, is_default_host=>0); - - -DB.DBA.VHOST_DEFINE (lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), - lpath=>'/fct/service', ppath=>'/SOAP/Http/fct_svc', - is_dav=>0, soap_user=>'dba', ses_vars=>0, is_default_host=>0); - -DB.DBA.VHOST_DEFINE (lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), - lpath=>'/fct/soap', ppath=>'/SOAP/', - is_dav=>0, soap_user=>'dba', ses_vars=>0, is_default_host=>0); - -DB.DBA.VHOST_DEFINE (lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), - lpath=>'/services/rdf/iriautocomplete.get', ppath=>'/SOAP/Http/IRI_AUTOCOMPLETE', - is_dav=>0, soap_user=>'PROXY', ses_vars=>0, is_default_host=>0); - -DB.DBA.VHOST_DEFINE (lhost=>registry_get ('dbp_lhost'), vhost=>registry_get ('dbp_vhost'), - lpath=>'/describe', ppath=>'/SOAP/Http/EXT_HTTP_PROXY_1', - is_dav=>0, soap_user=>'PROXY', ses_vars=>0, - opts=>vector ('url_rewrite', 'ext_fctabout_http_proxy_rule_list1'), - is_default_host=>0); - --- VoID VDs -DB.DBA.VHOST_REMOVE (lpath=>'/void/data'); -DB.DBA.VHOST_DEFINE (lpath=>'/void/data', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')), - vsp_user=>'dba', opts=>vector ('url_rewrite', 'dbpl_void_data_rule_list')); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_data_rule_list', 1, vector ('dbpl_void_data_rule_1')); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_data_rule_1', 1, '/void/data/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1, -'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'%%2Fvoid%%2F&query='||dbp_gen_describe('void')||'&format=%U', -vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, ''); - --- HTML -DB.DBA.VHOST_REMOVE (lpath=>'/void/page'); -DB.DBA.VHOST_DEFINE (lpath=>'/void/page', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')), - opts=>vector ('url_rewrite', 'dbpl_void_page_rule_list')); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_page_rule_list', 1, vector ('dbpl_void_page_rule_1')); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_page_rule_1', 1, '/void/page/(.*)', vector ('par_1'), 1, -registry_get('_dbpedia_path_')||'description.vsp?res=%%2Fvoid%%2F%U', vector ('par_1'), NULL, NULL, 0, 0, ''); - - --- IRIs -DB.DBA.VHOST_REMOVE (lpath=>'/void'); -DB.DBA.VHOST_DEFINE (lpath=>'/void', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector ('url_rewrite', 'dbpl_void_rule_list')); - -DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_rule_list', 1, - vector ('dbpl_void_rule_1', 'dbpl_void_rule_2', 'dbpl_void_rule_3', 'dbpl_void_rule_4')); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_1', 1, '/void/(.*)\x24', vector ('par_1'), 1, - '/void/page/%s', vector ('par_1'), NULL, NULL, 2, 303, NULL); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_2', 1, '/void/(.*)\x24', vector ('par_1'), 1, - '/void/data/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_3', 1, '/void/(.*)\x24', vector ('par_1'), 1, - '/void/data/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 2, 303, 'Content-Type: text/rdf+n3'); -DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_4', 1, '/void/(.*)\x24', vector ('par_1'), 1, - '/void/data/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); - -TTLP ( -' -@prefix owl: . - - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . - owl:equivalentProperty . -', '', 'http://dbpedia.org/schema/property_rules#'); - diff --git a/binsrc/dbpedia/dbpedia_sticker.xml b/binsrc/dbpedia/dbpedia_sticker.xml new file mode 100644 index 0000000000..7d786295f5 --- /dev/null +++ b/binsrc/dbpedia/dbpedia_sticker.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.eot b/binsrc/dbpedia/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.eot rename to binsrc/dbpedia/fonts/glyphicons-halflings-regular.eot diff --git a/binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.svg b/binsrc/dbpedia/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.svg rename to binsrc/dbpedia/fonts/glyphicons-halflings-regular.svg diff --git a/binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.ttf b/binsrc/dbpedia/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.ttf rename to binsrc/dbpedia/fonts/glyphicons-halflings-regular.ttf diff --git a/binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.woff b/binsrc/dbpedia/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.woff rename to binsrc/dbpedia/fonts/glyphicons-halflings-regular.woff diff --git a/binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.woff2 b/binsrc/dbpedia/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from binsrc/dbpedia/vsp/statics/fonts/glyphicons-halflings-regular.woff2 rename to binsrc/dbpedia/fonts/glyphicons-halflings-regular.woff2 diff --git a/binsrc/dbpedia/vsp/statics/images/LoDLogo.gif b/binsrc/dbpedia/images/LoDLogo.gif similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/LoDLogo.gif rename to binsrc/dbpedia/images/LoDLogo.gif diff --git a/binsrc/dbpedia/vsp/statics/images/dbpedia_logo.png b/binsrc/dbpedia/images/dbpedia_logo.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/dbpedia_logo.png rename to binsrc/dbpedia/images/dbpedia_logo.png diff --git a/binsrc/dbpedia/vsp/statics/images/dbpedia_logo_land_120.png b/binsrc/dbpedia/images/dbpedia_logo_land_120.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/dbpedia_logo_land_120.png rename to binsrc/dbpedia/images/dbpedia_logo_land_120.png diff --git a/binsrc/dbpedia/vsp/statics/images/od_80x15_red_green.png b/binsrc/dbpedia/images/od_80x15_red_green.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/od_80x15_red_green.png rename to binsrc/dbpedia/images/od_80x15_red_green.png diff --git a/binsrc/dbpedia/vsp/statics/images/rdf-icon.gif b/binsrc/dbpedia/images/rdf-icon.gif similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf-icon.gif rename to binsrc/dbpedia/images/rdf-icon.gif diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c.png b/binsrc/dbpedia/images/rdf_w3c.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c.png rename to binsrc/dbpedia/images/rdf_w3c.png diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c.svg b/binsrc/dbpedia/images/rdf_w3c.svg similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c.svg rename to binsrc/dbpedia/images/rdf_w3c.svg diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c_300.png b/binsrc/dbpedia/images/rdf_w3c_300.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c_300.png rename to binsrc/dbpedia/images/rdf_w3c_300.png diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c_500.png b/binsrc/dbpedia/images/rdf_w3c_500.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c_500.png rename to binsrc/dbpedia/images/rdf_w3c_500.png diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c_742.png b/binsrc/dbpedia/images/rdf_w3c_742.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c_742.png rename to binsrc/dbpedia/images/rdf_w3c_742.png diff --git a/binsrc/dbpedia/vsp/statics/images/rdf_w3c_742_trans.png b/binsrc/dbpedia/images/rdf_w3c_742_trans.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/rdf_w3c_742_trans.png rename to binsrc/dbpedia/images/rdf_w3c_742_trans.png diff --git a/binsrc/dbpedia/vsp/statics/images/sw-cube.png b/binsrc/dbpedia/images/sw-cube.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-cube.png rename to binsrc/dbpedia/images/sw-cube.png diff --git a/binsrc/dbpedia/vsp/statics/images/sw-rdf-gray.png b/binsrc/dbpedia/images/sw-rdf-gray.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-rdf-gray.png rename to binsrc/dbpedia/images/sw-rdf-gray.png diff --git a/binsrc/dbpedia/vsp/statics/images/sw-sparql-blue.png b/binsrc/dbpedia/images/sw-sparql-blue.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-sparql-blue.png rename to binsrc/dbpedia/images/sw-sparql-blue.png diff --git a/binsrc/dbpedia/vsp/statics/images/sw-vert-v.png b/binsrc/dbpedia/images/sw-vert-v.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-vert-v.png rename to binsrc/dbpedia/images/sw-vert-v.png diff --git a/binsrc/dbpedia/vsp/statics/images/sw-vert-v.svg b/binsrc/dbpedia/images/sw-vert-v.svg similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-vert-v.svg rename to binsrc/dbpedia/images/sw-vert-v.svg diff --git a/binsrc/dbpedia/vsp/statics/images/sw-vert-v_780_trans.png b/binsrc/dbpedia/images/sw-vert-v_780_trans.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/sw-vert-v_780_trans.png rename to binsrc/dbpedia/images/sw-vert-v_780_trans.png diff --git a/binsrc/dbpedia/vsp/statics/images/virt_power_no_border.png b/binsrc/dbpedia/images/virt_power_no_border.png similarity index 100% rename from binsrc/dbpedia/vsp/statics/images/virt_power_no_border.png rename to binsrc/dbpedia/images/virt_power_no_border.png diff --git a/binsrc/dbpedia/vsp/statics/js/bootstrap.min.js b/binsrc/dbpedia/js/bootstrap.min.js similarity index 100% rename from binsrc/dbpedia/vsp/statics/js/bootstrap.min.js rename to binsrc/dbpedia/js/bootstrap.min.js diff --git a/binsrc/dbpedia/vsp/statics/js/dbpedia.js b/binsrc/dbpedia/js/dbpedia.js similarity index 100% rename from binsrc/dbpedia/vsp/statics/js/dbpedia.js rename to binsrc/dbpedia/js/dbpedia.js diff --git a/binsrc/dbpedia/vsp/statics/js/jquery.min.js b/binsrc/dbpedia/js/jquery.min.js similarity index 100% rename from binsrc/dbpedia/vsp/statics/js/jquery.min.js rename to binsrc/dbpedia/js/jquery.min.js diff --git a/binsrc/dbpedia/make_vad.sh b/binsrc/dbpedia/make_vad.sh deleted file mode 100755 index eae15d37b9..0000000000 --- a/binsrc/dbpedia/make_vad.sh +++ /dev/null @@ -1,466 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2024 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -# check version_init procedure below - -# ---------------------------------------------------------------------- -# Fix issues with LOCALE -# ---------------------------------------------------------------------- -LANG=C -LC_ALL=POSIX -export LANG LC_ALL - -VERSION="1.00.00" -LOGDIR=`pwd` -STICKER_DAV="vad_dav.xml" -STICKER_FS="vad_fs.xml" -PACKDATE=`date +"%Y-%m-%d %H:%M"` -SERVER=${SERVER-} -THOST=${THOST-localhost} -TPORT=${TPORT-8445} -PORT=${PORT-1940} -ISQL=${ISQL-isql} -VAD_NAME="dbpedia" -VAD_PKG_NAME="dbpedia" -VAD_DESC="DBpedia" -LOGFILE="${LOGDIR}/make_"$VAD_PKG_NAME"_vad.log" -VAD_NAME_DEVEL="$VAD_PKG_NAME"_filesystem.vad -VAD_NAME_RELEASE="$VAD_PKG_NAME"_dav.vad -NEED_VERSION=05.00.3028 -HOST=localhost -DSN="$PORT" -HOST_OS=`uname -s | grep WIN` -if [ "x$HOST_OS" != "x" ] -then -TEMPFILE="`cygpath -m $TMP/isql.$$`" -if [ "x$SRC" != "x" ] -then -HOME=$SRC -else -HOME="`cygpath -m $HOME`" -fi -LN="cp -rf" -RM="rm -rf" -else -TEMPFILE=/tmp/isql.$$ -LN="ln -fs" -RM="rm -f" -fi -VOS=0 -if [ -f $HOME/autogen.sh ] -then - VOS=1 -fi - -if [ "z$SERVER" = "z" ] -then - if [ "x$HOST_OS" != "x" ] - then - SERVER=virtuoso-odbc-t.exe - else - SERVER=virtuoso - fi -fi - -. $HOME/binsrc/tests/suite/test_fn.sh - -if [ -f /usr/xpg4/bin/rm ] -then - myrm=/usr/xpg4/bin/rm -else - myrm=rm -fi - -version_init() -{ - if [ -f vad_version ] - then - VERSION=`cat vad_version` - else - LOG "The vad_version does not exist, please verify your checkout" - exit 1 - fi -} - -do_command_safe () { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* 2>&1 > "${LOGFILE}.tmp" - if test $? -ne 0 - then - cat "${LOGFILE}.tmp" >> ${LOGFILE} - LOG "***FAILED: starting $command" - else - if egrep '^\*\*\*' "${LOGFILE}.tmp" > /dev/null - then - LOG "***FAILED: execution of $command" - msg=`cat ${LOGFILE}.tmp` - echo "------------ SQL ERROR -------------" - echo "$msg" - echo "------------------------------------" - echo "------------ SQL ERROR -------------" >> $LOGFILE - echo "$msg" >> $LOGFILE - echo "------------------------------------" >> $LOGFILE - else - LOG "PASSED: $command" - fi - fi - rm "${LOGFILE}.tmp" 2>/dev/null -} - -do_command() { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - if test $? -ne 0 - then - LOG "***FAILED: $command" - else - LOG "PASSED: $command" - fi -} - -directory_clean() { - $myrm -rf vad 2>/dev/null - $myrm -rf vad.* 2>/dev/null - $myrm -rf make_vad.log 2>/dev/null - $myrm -rf virtuoso.db 2>/dev/null - $myrm -rf virtuoso.trx 2>/dev/null - $myrm -rf virtuoso.tdb 2>/dev/null - $myrm -rf virtuoso.log 2>/dev/null - $myrm -rf virtuoso.ini 2>/dev/null -} - -directory_init() { - mkdir vad - mkdir vad/code - mkdir vad/code/dbpedia - mkdir vad/vsp - mkdir vad/vsp/dbpedia - mkdir vad/vsp/dbpedia/statics - mkdir vad/vsp/dbpedia/statics/css - mkdir vad/vsp/dbpedia/statics/fonts - mkdir vad/vsp/dbpedia/statics/images - mkdir vad/vsp/dbpedia/statics/js - - cd vsp > /dev/null 2>&1 - for f in `find . -type f | grep -v "/CVS/" | grep -v "\.sql" ` - do - #echo $f - cp $f ../vad/vsp/dbpedia/$f - done - cd .. > /dev/null 2>&1 - - cp dbpedia_init.sql vad/code/dbpedia - cp dbpedia_local.sql vad/code/dbpedia - [ -d demo ] && cp demos/*.isparql vad/code/dbpedia - cp vsp/*.sql vad/code/dbpedia -} - -virtuoso_start() { - timeout=120 - - ECHO "Starting Virtuoso server ..." - if [ "z$HOST_OS" != "z" ] - then - "$SERVER" +foreground & - - starth=`date | cut -f 2 -d :` - starts=`date | cut -f 3 -d :|cut -f 1 -d " "` - - while true - do - sleep 6 - if (netstat -an | grep "[\.\:]$PORT" | grep LISTEN > /dev/null) - then - break - fi - nowh=`date | cut -f 2 -d :` - nows=`date | cut -f 3 -d : | cut -f 1 -d " "` - - nowh=`expr $nowh - $starth` - nows=`expr $nows - $starts` - - nows=`expr $nows + $nowh \* 60` - if test $nows -ge $timeout - then - ECHO "***FAILED: Could not start Virtuoso Server within $timeout seconds" - exit 1 - fi - done - else - "$SERVER" +wait - if test $? -ne 0 - then - ECHO "***FAILED: Could not start Virtuoso Server" - exit 1 - fi - fi - - ECHO "Virtuoso server started" - return 0 -} - -virtuoso_shutdown() { - LOG "Shutdown Virtuoso Server..." - $ISQL $DSN dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=raw_exit();" $* >/dev/null - #sleep 10 -} - -sticker_init() { - ISDAV=$1 - if [ "$ISDAV" = "1" ] ; then - BASE_PATH_HTTP="/DAV/VAD/" - BASE_PATH_CODE="/DAV/VAD/" - TYPE="dav" - STICKER=$STICKER_DAV - PPATH="/DAV/VAD/$VAD_NAME/" - DPPATH="/DAV/VAD" - else - BASE_PATH_HTTP="./vad/vsp/" - BASE_PATH_CODE="./vad/vsp/" - TYPE="http" - STICKER=$STICKER_FS - PPATH="/vad/vsp/$VAD_NAME/" - DPPATH="/vad/vsp" - fi - LOG "VAD Sticker $STICKER creation..." - echo "" > $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " > $STICKER - echo " if (lt (sys_stat ('st_dbms_ver'), '$NEED_VERSION')) " >> $STICKER - echo " { " >> $STICKER - echo " result ('ERROR', 'The $VAD_DESC package requires server version $NEED_VERSION or greater'); " >> $STICKER - echo " signal ('FATAL', 'The $VAD_DESC package requires server version $NEED_VERSION or greater'); " >> $STICKER - echo " } " >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " ; " >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " set_qualifier ('DB');" >> $STICKER -if [ "$ISDAV" = "1" ] ; then - echo " registry_set('_"$VAD_NAME"_path_', '/DAV/VAD/$VAD_NAME/');" >> $STICKER -else - echo " registry_set('_"$VAD_NAME"_path_', '/vad/vsp/$VAD_NAME/');" >> $STICKER -fi - echo " registry_set('_"$VAD_NAME"_dav_', '$ISDAV');" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/dbpedia_local.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/dbpedia_init.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/description.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " RDFS_RULE_SET ('http://dbpedia.org/resource/inference/rules/dbpedia#', 'http://dbpedia.org/resource/classes#');" >> $STICKER - echo " RDFS_RULE_SET ('http://dbpedia.org/resource/inference/rules/umbel#', 'http://dbpedia.org/resource/classes/umbel#');" >> $STICKER - echo " RDFS_RULE_SET ('http://dbpedia.org/resource/inference/rules/yago#', 'http://dbpedia.org/resource/classes/yago#');" >> $STICKER - echo " RDFS_RULE_SET ('http://dbpedia.org/resource/inference/rules/opencyc#', 'http://dbpedia.org/resource/classes/opencyc#');" >> $STICKER - echo " RDFS_RULE_SET ('http://dbpedia.org/schema/property_rules#', 'http://dbpedia.org/schema/property_rules#');" >> $STICKER - echo " RDFS_RULE_SET ('http://www.ontologyportal.org/inference/rules/SUMO#', 'http://www.ontologyportal.org/SUMO#');" >> $STICKER - echo " RDFS_RULE_SET ('http://www.ontologyportal.org/inference/rules/WordNet#', 'http://www.ontologyportal.org/WordNet#');" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " ;" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER -# echo " " >> $STICKER -# echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - - perms='110100000NN' - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - - if test -d demos - then - cd demos >/dev/null 2>&1 - for file in `find . -type f -print | grep -v CVS | sort | cut -b3-` - do - case "$file" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac - echo " " >> ../$STICKER - done - cd .. >/dev/null 2>&1 - fi - - cd vsp >/dev/null 2>&1 - for file in `find . -type f -print | grep -v CVS | grep -v ".sql" | sort | cut -b3-` - do - case "$file" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac - echo " " >> ../$STICKER - done - cd .. >/dev/null 2>&1 - - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER -} - -virtuoso_init() { - LOG "Virtuoso.ini creation..." - echo " -[Database] -DatabaseFile = vad.db -TransactionFile = vad.trx -ErrorLogFile = vad.log -ErrorLogLevel = 7 -FileExtend = 200 -Striping = 0 -LogSegments = 0 -Syslog = 0 -; -; Server parameters -; -[Parameters] -ServerPort = $PORT -ServerThreads = 100 -CheckpointInterval = 0 -NumberOfBuffers = 2000 -MaxDirtyBuffers = 1200 -MaxCheckpointRemap = 2000 -UnremapQuota = 0 -AtomicDive = 1 -PrefixResultNames = 0 -CaseMode = 2 -DisableMtWrite = 0 -MaxStaticCursorRows = 5000 -AllowOSCalls = 0 -DirsAllowed = . -CallstackOnException = 1 - -; -; HTTP server parameters -; -; Timeout values are seconds -; - -[!HTTPServer] -ServerPort = $TPORT -ServerRoot = . -ServerThreads = 5 -MaxKeepAlives = 10 -EnabledDavVSP = 1 - -[Client] -SQL_QUERY_TIMEOUT = 0 -SQL_TXN_TIMEOUT = 0 -SQL_PREFETCH_ROWS = 100 -SQL_PREFETCH_BYTES = 16000 -SQL_NO_CHAR_C_ESCAPE = 0 - -[AutoRepair] -BadParentLinks = 0 -BadDTP = 0 - -[Replication] -ServerName = the_big_server -ServerEnable = 1 -QueueMax = 50000" > virtuoso.ini - - virtuoso_start -} - -vad_create() { - STICKER=$1 - V_NAME=$2 - mydir=`pwd` - do_command_safe $DSN "DB.DBA.VAD_PACK('$STICKER', '.', '$V_NAME')" - do_command_safe $DSN "commit work" - do_command_safe $DSN "checkpoint" -} - -BANNER "STARTED $VAD_DESC PACKAGING" - -$ISQL -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: $VAD_DESC PACKAGING, isql is not available" - exit 1 -fi -$SERVER -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: $VAD_DESC PACKAGING, server is not available" - exit 1 -fi - - -virtuoso_shutdown -directory_clean -directory_init -version_init -sticker_init 1 -sticker_init 0 -virtuoso_init -vad_create $STICKER_FS $VAD_NAME_DEVEL -vad_create $STICKER_DAV $VAD_NAME_RELEASE -virtuoso_shutdown -chmod 644 $VAD_NAME_DEVEL -chmod 644 $VAD_NAME_RELEASE - -CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" -if test $STATUS -eq 0 -then - $myrm -f *.vad - exit 1 -fi - -directory_clean - -BANNER "COMPLETED VAD PACKAGING" -#tar zcvf dbpedia_load.tar.gz dbpedia_dav.vad dbpedia_install.sh dbpedia_post.sql load_nt.sh stats.sql README.txt dbpedia.ini -exit 0 diff --git a/binsrc/dbpedia/sql/dbpedia_del.sql b/binsrc/dbpedia/sql/dbpedia_del.sql new file mode 100644 index 0000000000..65e6f32b6c --- /dev/null +++ b/binsrc/dbpedia/sql/dbpedia_del.sql @@ -0,0 +1,105 @@ +-- +-- $Id$ +-- +-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) +-- project. +-- +-- Copyright (C) 1998-2024 OpenLink Software +-- +-- This project is free software; you can redistribute it and/or modify it +-- under the terms of the GNU General Public License as published by the +-- Free Software Foundation; only version 2 of the License, dated June 1991. +-- +-- This program is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License along +-- with this program; if not, write to the Free Software Foundation, Inc., +-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +-- +-- + +-- +-- Clean up deprecated RULELISTS +-- +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_data_rule_list'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_2'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_3'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_category'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_owl'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_prop'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_rule_list_type'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''dbp_wc_rule_list1'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''pvsp_rule_data3'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''pvsp_rule_data4'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''pvsp_rule_data6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULELIST(''pvsp_rule_list7'', 1)', 0); + +-- +-- Clean up deprecated URLREWRITE rules +-- +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_about_rule_1'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule0'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule1'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule2'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule3'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule3-1'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule3-2'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule4'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule5'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_data_rule8'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_12'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_13'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_14'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_18'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_19'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_category12'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_rule_category14'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_wc_rule1'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''dbp_wc_rule2'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''owl_rule_6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''owl_rule_7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''owl_rule_18'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''owl_rule_19'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''prop_rule_6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''prop_rule_7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''prop_rule_18'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''prop_rule_19'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data3_rule'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data3_rule_2'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data3_rule_3'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data4_rule'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data6_rule'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''pvsp_data_rule7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''type_rule_6'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''type_rule_7'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''type_rule_18'', 1)', 0); +EXEC_STMT ('DB.DBA.URLREWRITE_DROP_RULE(''type_rule_19'', 1)', 0); + + +-- +-- Clean up deprecated VARIANT maps +-- +delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbp_rule_list_2'; +delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = 'dbp_rule_list_category'; + + +--- +--- Drop old procedures +--- +EXEC_STMT ('drop procedure DB.DBA.SPARQL_DESC_DICT_DBPEDIA_PHYSICAL', 0); + + +-- +-- Remove old dbpedia.org:80 +-- +delete from DB.DBA.HTTP_PATH where HP_HOST = registry_get('dbp_vhost') and HP_LISTEN_HOST = registry_get('dbp_lhost'); + +--delete from SYS_HTTP_LISTENERS where HL_INTERFACE = registry_get('dbp_lhost'); diff --git a/binsrc/dbpedia/dbpedia_local.sql b/binsrc/dbpedia/sql/dbpedia_local.sql similarity index 82% rename from binsrc/dbpedia/dbpedia_local.sql rename to binsrc/dbpedia/sql/dbpedia_local.sql index 307fdda533..30ee4a390b 100644 --- a/binsrc/dbpedia/dbpedia_local.sql +++ b/binsrc/dbpedia/sql/dbpedia_local.sql @@ -25,7 +25,7 @@ create procedure dbp_setup () { --# if utf-8 iri's are used if (not isstring(registry_get ('dbp_decode_iri'))) - registry_set ('dbp_decode_iri','off'); + registry_set ('dbp_decode_iri','on'); --# the resource domain e.g. http://(xx.)dbpedia.org/resource/... if (not isstring(registry_get('dbp_domain'))) @@ -505,6 +505,42 @@ DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data5_rule_1', 1, '/data5/(.*)\\.(n3 vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, ''); +-- Datatype +DB.DBA.VHOST_REMOVE (lpath=>'/datatype'); +DB.DBA.VHOST_DEFINE (lpath=>'/datatype', + ppath=>'/', + is_dav=>0, + def_page=>'', + opts=>vector ('url_rewrite', 'dbpl_type_rule_list') +); +DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_type_rule_list', 1, vector ('dbpl_type_rule_1', 'dbpl_type_rule_2', 'dbpl_type_rule_3', 'dbpl_type_rule_4')); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_type_rule_1', 1, '(/[^#]*)', vector ('par_1'), 1, +registry_get('_dbpedia_path_')||'description.vsp?res=%U', vector ('par_1'), NULL, NULL, 0, 0, ''); + +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_type_rule_2', 1, '/datatype/(.*)\x24', vector ('par_1'), 1, +'/data6/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); + +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_type_rule_3', 1, '/datatype/(.*)\x24', vector ('par_1'), 1, +'/data6/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 1, 303, 'Content-Type: text/rdf+n3'); + +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_type_rule_4', 1, '/datatype/(.*)\x24', vector ('par_1'), 1, +'/data6/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); + +-- RDF for datatype +DB.DBA.VHOST_REMOVE (lpath=>'/data6'); +DB.DBA.VHOST_DEFINE (lpath=>'/data6', + ppath=>registry_get('_dbpedia_path_'), + is_dav=>atoi (registry_get('_dbpedia_dav_')), + vsp_user=>'dba', + opts=>vector ('url_rewrite', 'dbpl_data6_rule_list', 'expiration_function', 'DB.DBA.DBP_CHECK_304', 'graph', registry_get ('dbp_graph')) +); + +DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_data6_rule_list', 1, vector ('dbpl_data6_rule_1')); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_data6_rule_1', 1, '/data6/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1, +'/sparql?default-graph-uri=' || registry_get('dbp_graph_encoded') ||'&query='||dbp_gen_describe ('datatype')||'&format=%U', +vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, ''); + + create procedure dbpl_robots () { if (not isstring (http_root () || '/robots.txt')) @@ -526,3 +562,58 @@ DB.DBA.VHOST_DEFINE ( lhost=>'*ini*', vhost=>'*ini*', lpath=>'/sparql', ppath=>' opts=>vector ('browse_sheet', '', 'noinherit', 'yes', 'cors', '*', 'cors_restricted', 0), is_default_host=>0); + +-- VoID VDs +DB.DBA.VHOST_REMOVE (lpath=>'/void/data'); +DB.DBA.VHOST_DEFINE (lpath=>'/void/data', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')), + vsp_user=>'dba', opts=>vector ('url_rewrite', 'dbpl_void_data_rule_list')); + +DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_data_rule_list', 1, vector ('dbpl_void_data_rule_1')); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_data_rule_1', 1, '/void/data/(.*)\\.(n3|rdf|ttl)', vector ('par_1', 'fmt'), 1, +'/sparql?default-graph-uri=http%%3A%%2F%%2F'||replace(registry_get('dbp_graph'),'http://','')||'%%2Fvoid%%2F&query='||dbp_gen_describe('void')||'&format=%U', +vector ('par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'par_1', 'fmt'), NULL, NULL, 2, null, ''); + +-- HTML +DB.DBA.VHOST_REMOVE (lpath=>'/void/page'); +DB.DBA.VHOST_DEFINE (lpath=>'/void/page', ppath=>registry_get('_dbpedia_path_'), is_dav=>atoi (registry_get('_dbpedia_dav_')), + opts=>vector ('url_rewrite', 'dbpl_void_page_rule_list')); + +DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_page_rule_list', 1, vector ('dbpl_void_page_rule_1')); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_page_rule_1', 1, '/void/page/(.*)', vector ('par_1'), 1, +registry_get('_dbpedia_path_')||'description.vsp?res=%%2Fvoid%%2F%U', vector ('par_1'), NULL, NULL, 0, 0, ''); + + +-- IRIs +DB.DBA.VHOST_REMOVE (lpath=>'/void'); +DB.DBA.VHOST_DEFINE (lpath=>'/void', ppath=>'/', is_dav=>0, def_page=>'', opts=>vector ('url_rewrite', 'dbpl_void_rule_list')); + +DB.DBA.URLREWRITE_CREATE_RULELIST ( 'dbpl_void_rule_list', 1, + vector ('dbpl_void_rule_1', 'dbpl_void_rule_2', 'dbpl_void_rule_3', 'dbpl_void_rule_4')); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_1', 1, '/void/(.*)\x24', vector ('par_1'), 1, + '/void/page/%s', vector ('par_1'), NULL, NULL, 2, 303, NULL); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_2', 1, '/void/(.*)\x24', vector ('par_1'), 1, + '/void/data/%s.rdf', vector ('par_1'), NULL, 'application/rdf.xml', 2, 303, 'Content-Type: application/rdf+xml'); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_3', 1, '/void/(.*)\x24', vector ('par_1'), 1, + '/void/data/%s.n3', vector ('par_1'), NULL, 'text/rdf.n3', 2, 303, 'Content-Type: text/rdf+n3'); +DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( 'dbpl_void_rule_4', 1, '/void/(.*)\x24', vector ('par_1'), 1, + '/void/data/%s.n3', vector ('par_1'), NULL, 'application/x-turtle', 2, 303, 'Content-Type: application/x-turtle'); + + +TTLP ( +' +@prefix owl: . + + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . + owl:equivalentProperty . +', '', 'http://dbpedia.org/schema/property_rules#'); + diff --git a/binsrc/dbpedia/sql/dbpedia_pl.sql b/binsrc/dbpedia/sql/dbpedia_pl.sql new file mode 100644 index 0000000000..757412cd04 --- /dev/null +++ b/binsrc/dbpedia/sql/dbpedia_pl.sql @@ -0,0 +1,206 @@ +-- +-- $Id$ +-- +-- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) +-- project. +-- +-- Copyright (C) 1998-2024 OpenLink Software +-- +-- This project is free software; you can redistribute it and/or modify it +-- under the terms of the GNU General Public License as published by the +-- Free Software Foundation; only version 2 of the License, dated June 1991. +-- +-- This program is distributed in the hope that it will be useful, but +-- WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License along +-- with this program; if not, write to the Free Software Foundation, Inc., +-- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +-- +-- + + +create procedure DB.DBA.DBP_GRAPH_PARAM1 (in par varchar, in fmt varchar, in val varchar) +{ + declare tmp any; + tmp := sprintf ('default-graph-uri=%U', registry_get ('dbp_graph')); + if (par = 'gr') + { + val := trim (val, '/'); + if (length (val) = 0) + val := ''; + if (val = 'en') + val := ''; + if (val <> '') + { + val := 'http://' || val || '.dbpedia.org'; + tmp := tmp || sprintf ('&named-graph-uri=%U', val); + } + } + else + tmp := val; + return sprintf (fmt, tmp); +} +; + + +create procedure DB.DBA.DBP_LINK_HDR (in in_path varchar) +{ + declare host, lines, accept, loc, alt, exp, lic any; + lines := http_request_header (); +-- dbg_obj_print ('in_path: ', in_path); +-- dbg_obj_print ('lines: ', lines); + loc := ''; alt := ''; exp := ''; + host := http_request_header(lines, 'Host', null, ''); + if (regexp_match ('/data/([a-z_\\-]*/)?(.*)\\.(nt|n3|rdf|ttl|jrdf|jsonld|xml|atom|json|jsod|ntriples)', in_path) is null and in_path like '/data/%') + { + declare tmp any; + accept := http_request_header(lines, 'Accept', null, 'application/rdf+xml'); + accept := regexp_match ('(application/rdf.xml)|(text/rdf.n3)|(text/n3)', accept); + tmp := split_and_decode (in_path, 0, '\0\0/'); + if (length (tmp) and strstr (http_header_get (), 'Content-Location') is null) + { + tmp := tmp [ length (tmp) - 1 ]; + if (accept is null) + accept := 'application/rdf+xml'; + if (accept = 'application/rdf+xml') + loc := 'Content-Location: ' || tmp || '.xml\r\n'; + else if (accept = 'text/rdf+n3') + loc := 'Content-Location: ' || tmp || '.n3\r\n'; + else if (accept = 'text/n3') + loc := 'Content-Location: ' || tmp || '.n3\r\n'; + } + } + if (in_path like '/data/%') + { + declare ext any; + declare p varchar; + ext := vector (vector ('xml', 'RDF/XML', 'application/rdf+xml'), vector ('n3', 'N3/Turtle', 'text/n3'), vector ('json', 'RDF/JSON', 'application/json')); + foreach (any ss in ext) do + { + declare s varchar; + s := ss[0]; + if (in_path not like '/data/%.'||s) + { + p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|atom|jsod|jsonld|ntriples)\x24', '.'||s); + alt := alt || sprintf ('; rel="alternate"; type="%s"; title="Structured Descriptor Document (%s format)", ', host, p, ss[2], ss[1]); + } + } + if (in_path not like '/data/%.atom') + { + p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', '.atom'); + alt := alt || sprintf ('; rel="alternate"; type="application/atom+xml"; title="OData (Atom+Feed format)", ', host, p); + } + if (in_path not like '/data/%.jsod') + { + p := regexp_replace (in_path, '\\.(nt|n3|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', '.jsod'); + alt := alt || sprintf ('; rel="alternate"; type="application/odata+json"; title="OData (JSON format)", ', host, p); + } + p := regexp_replace (in_path, '\\.(n3|nt|rdf|ttl|jrdf|xml|json|jsonld|atom)\x24', ''); + p := replace (p, '/data/', '/page/'); + alt := alt || sprintf ('; rel="alternate"; type="text/html"; title="XHTML+RDFa", ', host, p); + p := replace (p, '/page/', '/resource/'); + if (in_path not like '/resource/%') + { + alt := alt || sprintf ('; rel="http://xmlns.com/foaf/0.1/primaryTopic", ', host, p); + alt := alt || sprintf ('; rev="describedby", ', host, p); + } + else + { + alt := alt || sprintf ('; rev="http://xmlns.com/foaf/0.1/primaryTopic", ', host, p); + alt := alt || sprintf ('; rel="describedby", ', host, p); + } + if (registry_get ('dbp_pshb_hub') <> 0) + alt := alt || sprintf ('<%s>; rel="hub", ', registry_get ('dbp_pshb_hub')); + exp := sprintf ('Expires: %s\r\n', date_rfc1123 (dateadd ('day', 7, now ()))); + } + lic := '; rel="license", '; + return sprintf ('%s%sLink: %s%s; rel="timegate"', exp, loc, lic, alt, host, in_path); +} +; + + +create procedure DB.DBA.DBP_DATA_IRI1 (in par varchar, in fmt varchar, in val varchar) +{ + if (par = 'par_2' and length (val)) + { + declare arr any; + arr := split_and_decode (val); + if (length (arr) > 1 and arr[1] <> 'en' and length (arr[1])) + return sprintf (fmt, arr[1] || '/'); + val := ''; + } + return sprintf (fmt, val); +} +; + + +create procedure DB.DBA.DBP_TCN_LOC (in id any, in var any) +{ + return var; +} +; + + + +create procedure ensure_demo_user () +{ + if (exists (select 1 from SYS_USERS where U_NAME = 'demo')) + return; + exec ('create user "demo"'); + DB.DBA.user_set_qualifier ('demo', 'Demo'); +}; + +ensure_demo_user (); + +drop procedure ensure_demo_user; + + +create procedure create_demo_home () +{ + declare pwd any; + pwd := (select pwd_magic_calc (U_NAME, U_PASSWORD, 1) from SYS_USERS where U_NAME = 'dav'); + DAV_COL_CREATE ('/DAV/home/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); + DAV_COL_CREATE ('/DAV/home/demo/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); + DAV_COL_CREATE ('/DAV/home/demo/dbpedia/', '110100100', http_dav_uid(), http_dav_uid() + 1, 'dav', pwd); +}; + +create_demo_home (); +drop procedure create_demo_home; + + +create procedure upload_isparql () +{ + declare base varchar; + declare pwd any; + pwd := (select pwd_magic_calc (U_NAME, U_PASSWORD, 1) from SYS_USERS where U_NAME = 'dav'); + base := registry_get('_dbpedia_path_'); + if (base like '/DAV/%') + { + for select RES_FULL_PATH from WS..SYS_DAV_RES where RES_FULL_PATH like base||'%.isparql' do + { + DAV_COPY (RES_FULL_PATH, '/DAV/home/demo/dbpedia/', 0, '111101101NN', 'dav', 'administrators', 'dav', pwd); + } + } + else + { + declare arr any; + arr := sys_dirlist (base); + foreach (varchar f in arr) do + { + if (f like '%.isparql') + DAV_RES_UPLOAD ('/DAV/home/demo/dbpedia/'||f, file_to_string (base||f), '', '110100100R', http_dav_uid(), http_dav_gid(), 'dav', pwd); + } + } + -- the current trigger of isparql have bug + update WS..SYS_DAV_RES set RES_PERMS = '110100100NN' where RES_FULL_PATH like '/DAV/home/demo/dbpedia/%'; +} +; + +upload_isparql (); +drop procedure upload_isparql; + + + diff --git a/binsrc/dbpedia/vsp/description.sql b/binsrc/dbpedia/sql/description.sql similarity index 99% rename from binsrc/dbpedia/vsp/description.sql rename to binsrc/dbpedia/sql/description.sql index 059726daac..cbd57286ee 100644 --- a/binsrc/dbpedia/vsp/description.sql +++ b/binsrc/dbpedia/sql/description.sql @@ -51,6 +51,7 @@ create procedure dbp_ldd_set_ns_decl () dbp_domain || '/resource/', 'dbpedia-' || dbp_lang, dbp_domain || '/resource/' || dbp_category || ':', 'category-' || dbp_lang, dbp_domain || '/resource/' || dbp_template || ':', 'template-' || dbp_lang, + dbp_domain || '/datatype/', 'type-' || dbp_lang, 'http://dbpedia.org/datatype/', 'dbd', 'http://dbpedia.org/ontology/', 'dbo', @@ -85,6 +86,8 @@ create procedure dbp_ldd_set_ns_decl () 'http://www.w3.org/ns/prov#', 'prov', 'http://xmlns.com/foaf/0.1/', 'foaf', 'http://yago-knowledge.org/resource/', 'yago-res', + 'http://purl.org/linguistics/gold/', 'gold', + 'http://open.vocab.org/terms/', 'ov', 'http://commons.wikimedia.org/wiki/', 'wiki-commons', 'http://www.wikidata.org/entity/', 'wikidata', @@ -441,6 +444,7 @@ create procedure dbp_ldd_subject (in _S any, in _G varchar, in lines any := null if (length (data) and data[0][0] is not null and data[0][0] <> 0) best_str := data[0][0]; } + best_str := charset_recode (best_str, 'UTF-8', '_WIDE_'); return best_str; } ; diff --git a/binsrc/dbpedia/vad_version b/binsrc/dbpedia/vad_version index e0e2952fd3..bbe563f6b6 100644 --- a/binsrc/dbpedia/vad_version +++ b/binsrc/dbpedia/vad_version @@ -1 +1 @@ -1.4.43 +1.4.44 diff --git a/binsrc/driver/Makefile.am b/binsrc/driver/Makefile.am index 60ff9dd7c7..7833d87805 100644 --- a/binsrc/driver/Makefile.am +++ b/binsrc/driver/Makefile.am @@ -22,7 +22,7 @@ # # Driver version and description # -DRIVER_VERS = 07.02.3239 +DRIVER_VERS = 07.02.3240 DRIVER_DESC = OpenLink Virtuoso ODBC Driver diff --git a/binsrc/fct/.gitignore b/binsrc/fct/.gitignore index b2be36ed4d..99fca2dfc1 100644 --- a/binsrc/fct/.gitignore +++ b/binsrc/fct/.gitignore @@ -7,3 +7,4 @@ virtuoso.ini virtuoso.pxa virtuoso.tdb virtuoso.db +oat diff --git a/binsrc/fct/Makefile.am b/binsrc/fct/Makefile.am index 9f7aebbf6a..64ce2cc6a8 100644 --- a/binsrc/fct/Makefile.am +++ b/binsrc/fct/Makefile.am @@ -27,6 +27,30 @@ if WITH_FCT_VAD nodist_vad_DATA = fct_dav.vad endif +NEED_VERSION = 07.20.3226 +STICKER = fct_sticker.xml +VERBOSE = #--verbose +VERSION = `cat vad_version` + +DAV_FLAGS = $(VERBOSE) \ + --prefix "$(srcdir)" \ + --var="BASE_PATH=/DAV/VAD" \ + --var="ISDAV=1" \ + --var="NEED_VERSION=$(NEED_VERSION)" \ + --var="TYPE=dav" \ + --var="VERSION=$(VERSION)" + +fct_dav.vad: $(EXTRA_DIST) Makefile + $(PYTHON) $(top_srcdir)/binsrc/vadpacker/vadpacker.py \ + -o $(builddir)/fct_dav.vad \ + $(DAV_FLAGS) \ + $(srcdir)/$(STICKER) + +# ---------------------------------------------------------------------- +# +# Cleanup +# +# ---------------------------------------------------------------------- CLEANFILES = \ *.log \ *.vad \ @@ -40,11 +64,9 @@ CLEANFILES = \ vad_dav.xml \ vad_fs.xml -fct_dav.vad: $(EXTRA_DIST) - PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" PORT=$(PORT) HOME="$(TOP)" HOST=localhost $(SHELL) ./make_vad.sh - clean-local: - -rm -rf vad + -$(RM) -rf vad + -$(RM) -f oat # ---------------------------------------------------------------------- # @@ -52,29 +74,25 @@ clean-local: # # ---------------------------------------------------------------------- EXTRA_DIST = \ + $(srcdir)/$(STICKER) \ $(srcdir)/*.html \ - $(srcdir)/*.js \ - $(srcdir)/*.owl \ - $(srcdir)/*.sql \ $(srcdir)/*.txt \ $(srcdir)/*.vsp \ - $(srcdir)/*.xsl \ $(srcdir)/conductor/*.js \ $(srcdir)/conductor/*.sql \ $(srcdir)/conductor/*.vspx \ + $(srcdir)/css/*.css \ $(srcdir)/images/*.gif \ $(srcdir)/images/*.png \ $(srcdir)/images/*.svg \ - $(srcdir)/make_vad.sh \ - $(srcdir)/rdfdesc/*.sql \ + $(srcdir)/js/*.js \ + $(srcdir)/owl/*.owl \ $(srcdir)/rdfdesc/*.vsp \ - $(srcdir)/s/*.js \ - $(srcdir)/styles/*.css \ + $(srcdir)/sql/*.sql \ + $(srcdir)/xslt/*.xsl \ $(srcdir)/vad_version \ $(srcdir)/VirtTripleLoader/.classpath \ $(srcdir)/VirtTripleLoader/.project \ $(srcdir)/VirtTripleLoader/src/virtTripleLoaderInit/*.java \ - $(srcdir)/www/*.css \ $(srcdir)/www/*.html \ - $(srcdir)/www/*.sql \ $(srcdir)/www/*.vsp diff --git a/binsrc/fct/bbc_demo_queries.vsp b/binsrc/fct/bbc_demo_queries.vsp index fef76fd152..a0be772c0d 100644 --- a/binsrc/fct/bbc_demo_queries.vsp +++ b/binsrc/fct/bbc_demo_queries.vsp @@ -5,7 +5,7 @@ BBC demo queries - + @@ -31,7 +31,7 @@ If not set, '/fct/isparql_describe.xsl' is used. declare dav_pwd varchar; declare demo_dav_path, demo_xsl_uri varchar; - uriqa_str := cfg_item_value( virtuoso_ini_path(), 'URIQA','DefaultHost'); + uriqa_str := virtuoso_ini_item_value ('URIQA','DefaultHost'); if (uriqa_str is null) { @@ -48,7 +48,7 @@ If not set, '/fct/isparql_describe.xsl' is used. demo_xsl_uri := registry_get ('sparql_demo_xsl_uri'); - if (0 = demo_xsl_uri) demo_xsl_uri := 'http://' || uriqa_str || '/fct/isparql_describe.xsl'; + if (0 = demo_xsl_uri) demo_xsl_uri := 'http://' || uriqa_str || '/fct/xslt/isparql_describe.xsl'; ?> diff --git a/binsrc/fct/facet.vsp b/binsrc/fct/facet.vsp index 0230019752..4ffde92b70 100644 --- a/binsrc/fct/facet.vsp +++ b/binsrc/fct/facet.vsp @@ -10,7 +10,7 @@ declare main_ss varchar; declare pageUrl, query_str varchar; main_ss := registry_get ('fct_main_ss'); - if (not isstring (main_ss)) main_ss := 'styles/default.css'; + if (not isstring (main_ss)) main_ss := '/fct/css/default.css'; pageUrl := http_path(); query_str := ''; @@ -41,7 +41,7 @@ var featureList=["map", "combolist", "ajax", "tab", "json", "location"]; - + Entity Search, Find, and Explore - Documentation - + diff --git a/binsrc/fct/fct_inx.sql b/binsrc/fct/fct_inx.sql deleted file mode 100644 index b7b8d7f4ba..0000000000 --- a/binsrc/fct/fct_inx.sql +++ /dev/null @@ -1,36 +0,0 @@ --- --- $Id$ --- --- Alternate RDF index scheme for cases where G unspecified --- --- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) --- project. --- --- Copyright (C) 1998-2024 OpenLink Software --- --- This project is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the --- Free Software Foundation; only version 2 of the License, dated June 1991. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- General Public License for more details. --- --- You should have received a copy of the GNU General Public License along --- with this program; if not, write to the Free Software Foundation, Inc., --- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --- --- - -EXEC_STMT ('drop index RDF_QUAD_OGPS', 0); -create table R2 (G iri_id_8, S iri_id_8, P iri_id_8, O any, primary key (S, P, O, G)); -alter index R2 on R2 partition (S int (0hexffff00)); - -insert into R2 (G, S, P, O) select G, S, P, O from rdf_quad; -drop table RDF_QUAD; -alter table R2 rename RDF_QUAD; -create bitmap index RDF_QUAD_OPGS on RDF_QUAD (O, P, G, S) partition (O varchar (-1, 0hexffff)); -create bitmap index RDF_QUAD_POGS on RDF_QUAD (P, O, G, S) partition (O varchar (-1, 0hexffff)); -create bitmap index RDF_QUAD_GPOS on RDF_QUAD (G, P, O, S) partition (O varchar (-1, 0hexffff)); - diff --git a/binsrc/fct/fct_sticker.xml b/binsrc/fct/fct_sticker.xml new file mode 100644 index 0000000000..9fa914cb69 --- /dev/null +++ b/binsrc/fct/fct_sticker.xml @@ -0,0 +1,112 @@ + + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/binsrc/fct/s/description.js b/binsrc/fct/js/description.js similarity index 100% rename from binsrc/fct/s/description.js rename to binsrc/fct/js/description.js diff --git a/binsrc/fct/facet.js b/binsrc/fct/js/facet.js similarity index 100% rename from binsrc/fct/facet.js rename to binsrc/fct/js/facet.js diff --git a/binsrc/fct/make_vad.sh b/binsrc/fct/make_vad.sh deleted file mode 100755 index 55c91f257c..0000000000 --- a/binsrc/fct/make_vad.sh +++ /dev/null @@ -1,527 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2024 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -# ---------------------------------------------------------------------- -# Fix issues with LOCALE -# ---------------------------------------------------------------------- -LANG=C -LC_ALL=POSIX -export LANG LC_ALL - -# check version_init procedure below -VERSION="1.00.00" -LOGDIR=`pwd` -STICKER_DAV="vad_dav.xml" -STICKER_FS="vad_fs.xml" -PACKDATE=`date +"%Y-%m-%d %H:%M"` -SERVER=${SERVER-} -THOST=${THOST-localhost} -TPORT=${TPORT-8445} -PORT=${PORT-1940} -ISQL=${ISQL-isql} -VAD_NAME="fct" -VAD_PKG_NAME="fct" -VAD_DESC="Faceted Browser" -LOGFILE="${LOGDIR}/make_"$VAD_PKG_NAME"_vad.log" -VAD_NAME_DEVEL="$VAD_PKG_NAME"_filesystem.vad -VAD_NAME_RELEASE="$VAD_PKG_NAME"_dav.vad -NEED_VERSION=06.00.3117 -DSN="$HOST:$PORT" -SQLDEPS="ns.sql virt_rdf_label.sql virt_rdf_url.sql facet.sql complete_ddl.sql vad_fct_config.sql fct_endpoints.sql" -EXCEPT="b3sq.sql facet_test.sql fct_inx.sql srank.sql srank_1.sql srank23.sql complete_cl.sql complete_single.sql grants.sql" - -HOST_OS=`uname -s | grep WIN` -if [ "x$HOST_OS" != "x" ] -then - TEMPFILE="`cygpath -m $TMP/isql.$$`" - if [ "x$SRC" != "x" ] - then - HOME=$SRC - else - HOME="`cygpath -m $HOME`" - fi - LN="cp -rf" - RM="rm -rf" -else - TEMPFILE=/tmp/isql.$$ - LN="ln -fs" - RM="rm -f" -fi - -VOS=0 -if [ -f $HOME/autogen.sh ] -then - VOS=1 -fi - -if [ "z$SERVER" = "z" ] -then - if [ "x$HOST_OS" != "x" ] - then - SERVER=virtuoso-odbc-t.exe - else - SERVER=virtuoso - fi -fi - -. $HOME/binsrc/tests/suite/test_fn.sh - -if [ -f /usr/xpg4/bin/rm ] -then - myrm=/usr/xpg4/bin/rm -else - myrm=rm -fi - - -version_init() -{ - if [ -f vad_version ] - then - VERSION=`cat vad_version` - else - LOG "The vad_version does not exist, please verify your checkout" - exit 1 - fi -} - -do_command_safe () { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* 2>&1 > "${LOGFILE}.tmp" - if test $? -ne 0 - then - cat "${LOGFILE}.tmp" >> ${LOGFILE} - LOG "***FAILED: starting $command" - else - if egrep '^\*\*\*' "${LOGFILE}.tmp" > /dev/null - then - LOG "***FAILED: execution of $command" - msg=`cat ${LOGFILE}.tmp` - echo "------------ SQL ERROR -------------" - echo "$msg" - echo "------------------------------------" - echo "------------ SQL ERROR -------------" >> $LOGFILE - echo "$msg" >> $LOGFILE - echo "------------------------------------" >> $LOGFILE - else - LOG "PASSED: $command" - fi - fi - rm "${LOGFILE}.tmp" 2>/dev/null -} - -do_command() { - _dsn=$1 - command=$2 - shift - shift - echo "+ " $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - $ISQL $_dsn dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=$command" $* >> $LOGFILE - if test $? -ne 0 - then - LOG "***FAILED: $command" - else - LOG "PASSED: $command" - fi -} - -directory_clean() { - $myrm -rf vad 2>/dev/null - $myrm -rf vad.* 2>/dev/null - $myrm -rf make_vad.log 2>/dev/null - $myrm -rf virtuoso.db 2>/dev/null - $myrm -rf virtuoso.trx 2>/dev/null - $myrm -rf virtuoso.tdb 2>/dev/null - $myrm -rf virtuoso.log 2>/dev/null - $myrm -rf virtuoso.ini 2>/dev/null -} - -directory_init() { - mkdir -p vad/code/fct - mkdir -p vad/vsp/fct - - for d in `find . -type d | grep -v CVS | grep -v VirtTripleLoader` - do - mkdir -p -v vad/vsp/fct/$d - done - - for f in `find . -name '*.sql'` - do - cp $f vad/code/fct/"`basename $f`" - done - - for f in `find . -type f | grep -v '\\.sql' | grep -v '\\.vad' | grep -v '^vad_' | grep -v 'CVS' | grep -v VirtTripleLoader` - do - cp $f vad/vsp/fct/$f - done - - # components which are not in their place - cp -Rf $HOME/binsrc/oat vad/vsp/fct - #cp -Rf $HOME/binsrc/samples/dbpedia/vsp/statics vad/vsp/fct/rdfdesc - #cp -Rf $HOME/binsrc/rdf_mappers/virt_rdf_label.sql vad/vsp/fct - cp -Rf styles vad/vsp/fct/rdfdesc - cp -Rf s vad/vsp/fct/rdfdesc - - cat srank.sql | sed -e "s/, index rdf_quad_opgs//g" > vad/code/fct/srank_1.sql - -} - -virtuoso_start() { - timeout=120 - - ECHO "Starting Virtuoso server ..." - if [ "z$HOST_OS" != "z" ] - then - "$SERVER" +foreground & - - starth=`date | cut -f 2 -d :` - starts=`date | cut -f 3 -d :|cut -f 1 -d " "` - - while true - do - sleep 6 - if (netstat -an | grep "[\.\:]$PORT" | grep LISTEN > /dev/null) - then - break - fi - nowh=`date | cut -f 2 -d :` - nows=`date | cut -f 3 -d : | cut -f 1 -d " "` - - nowh=`expr $nowh - $starth` - nows=`expr $nows - $starts` - - nows=`expr $nows + $nowh \* 60` - if test $nows -ge $timeout - then - ECHO "***FAILED: Could not start Virtuoso Server within $timeout seconds" - exit 1 - fi - done - else - "$SERVER" +wait - if test $? -ne 0 - then - ECHO "***FAILED: Could not start Virtuoso Server" - exit 1 - fi - fi - - ECHO "Virtuoso server started" - return 0 -} - -virtuoso_shutdown() { - LOG "Shutdown Virtuoso Server..." - $ISQL $DSN dba dba ERRORS=STDOUT VERBOSE=OFF PROMPT=OFF "EXEC=raw_exit();" $* >/dev/null - #sleep 10 -} - -sticker_init() { - ISDAV=$1 - if [ "$ISDAV" = "1" ] ; then - BASE_PATH_HTTP="/DAV/VAD/" - BASE_PATH_CODE="/DAV/VAD/" - TYPE="dav" - STICKER=$STICKER_DAV - PPATH="/DAV/VAD/$VAD_NAME/" - DPPATH="/DAV/VAD" - else - BASE_PATH_HTTP="./vad/vsp/" - BASE_PATH_CODE="./vad/vsp/" - TYPE="http" - STICKER=$STICKER_FS - PPATH="/vad/vsp/$VAD_NAME/" - DPPATH="/vad/vsp" - fi - LOG "VAD Sticker $STICKER creation..." - echo "" > $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " > $STICKER - echo " if (lt (sys_stat ('st_dbms_ver'), '$NEED_VERSION')) " >> $STICKER - echo " { " >> $STICKER - echo " result ('ERROR', 'The $VAD_DESC package requires server version $NEED_VERSION or greater'); " >> $STICKER - echo " signal ('FATAL', 'The $VAD_DESC package requires server version $NEED_VERSION or greater'); " >> $STICKER - echo " } " >> $STICKER - #echo " if (not exists (select 1 from DB.DBA.SYS_KEYS where upper (KEY_NAME) = 'RDF_QUAD_OPGS')) " >> $STICKER - #echo " { " >> $STICKER - #echo " result ('ERROR', 'The $VAD_DESC package requires additional indexes, please refer to the documentation'); " >> $STICKER - #echo " signal ('FATAL', 'The $VAD_DESC package requires additional indexes, please refer to the documentation'); " >> $STICKER - #echo " } " >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " ; " >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " set_qualifier ('DB');" >> $STICKER -if [ "$ISDAV" = "1" ] ; then - echo " registry_set('_"$VAD_NAME"_url_', 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:/DAV/VAD/$VAD_NAME/');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_path_', '/DAV/VAD/$VAD_NAME/');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_dav_', '$ISDAV');" >> $STICKER -else - echo " registry_set('_"$VAD_NAME"_url_', 'file://vad/vsp/$VAD_NAME/');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_path_', '/vad/vsp/$VAD_NAME/');" >> $STICKER - echo " registry_set('_"$VAD_NAME"_dav_', '$ISDAV');" >> $STICKER -fi - echo " if (lt (sys_stat ('st_dbms_ver'), '06.00.3126') and not exists (select 1 from DB.DBA.SYS_KEYS where upper (KEY_NAME) = 'RDF_QUAD_OPGS') and (select count(*) from (select top 10000 1 as x from RDF_QUAD) stb) < 10000) { " >> $STICKER - echo " log_message ('Altering the index layout on RDF_QUAD'); " >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/fct_inx.sql', 0, 'report', $ISDAV);" >> $STICKER - echo " log_message ('done.'); " >> $STICKER - echo " } " >> $STICKER - - - for f in $SQLDEPS - do - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/$f', 0, 'report', $ISDAV);" >> $STICKER - done - - for f in `find vad/code/fct -type f -print | cut -b14-` - do - exclude=0 - if [ ! -z "$EXCEPT" -o ! -z "$SQLDEPS" ] - then - for ex in $EXCEPT $SQLDEPS - do - if [ ! -z "`echo $f | grep $ex`" ] - then - exclude=1 - fi - done - fi - if [ $exclude -eq 0 ] - then - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/$f', 0, 'report', $ISDAV);" >> $STICKER - fi - done - - echo " if (sys_stat ('cl_run_local_only') = 1) " >> $STICKER - - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/complete_single.sql', 0, 'report', $ISDAV); " >> $STICKER - echo " else { " >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/complete_cl.sql', 0, 'report', $ISDAV); " >> $STICKER - echo " } " >> $STICKER - - echo " if (exists (select 1 from DB.DBA.SYS_KEYS where upper (KEY_NAME) = 'RDF_QUAD_SP')) " >> $STICKER - - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/srank23.sql', 0, 'report', $ISDAV); " >> $STICKER - echo " else if (exists (select 1 from DB.DBA.SYS_KEYS where upper (KEY_NAME) = 'RDF_QUAD_OPGS')) " >> $STICKER - - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/srank.sql', 0, 'report', $ISDAV); " >> $STICKER - echo " else { " >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/srank_1.sql', 0, 'report', $ISDAV); " >> $STICKER - echo " result ('00000', 'You should read http://host:port/fct/install.html for instructions');" >> $STICKER - echo " } " >> $STICKER - echo " result ('00000', 'GUI is accesible via http://host:port/fct');" >> $STICKER - echo " result ('00000', 'Post-installation guide is available from http://host:port/fct/post_install.html');" >> $STICKER -# echo " } else { " >> $STICKER -# echo " VHOST_REMOVE (lpath=>'/fct'); " >> $STICKER -# echo " VHOST_DEFINE (lpath=>'/fct', " >> $STICKER -# echo " ppath=>case when registry_get('_fct_path_') = 0 then '/fct/' else registry_get('_fct_path_') end, " >> $STICKER -# echo " is_dav=>atoi (case when registry_get('_fct_dav_') = 0 then '0' else registry_get('_fct_dav_') end), " >> $STICKER -# echo " vsp_user=>'dba', def_page=>'install.html'); " >> $STICKER -# echo " result ('00000', 'Cannot complete installation, read instructions at http://host:port/fct');" >> $STICKER -# echo " } " >> $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('"$BASE_PATH_CODE"$VAD_NAME/grants.sql', 0, 'report', $ISDAV); " >> $STICKER - echo "" >> $STICKER - echo " -- Copy FCT VAD configuration files to Conductor UI folder" >> $STICKER - echo " DB.DBA.fct_vad_configure ('fct', 'fct/conductor', 'vad_fct_config.vspx');" >> $STICKER - echo " DB.DBA.fct_vad_configure ('fct', 'fct/conductor', 'vad_fct_config.js');" >> $STICKER - echo "" >> $STICKER - echo " -- Check if automated label fill is enabled" >> $STICKER - echo " if (virtuoso_ini_item_value ('SPARQL', 'LabelInferenceName') = 'facets')" >> $STICKER - echo " registry_set ('urilbl_ac_init_status', '2');" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " > $STICKER - echo " DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/fct/sql/fct_drop.sql', 1, 'report', 1);" >> $STICKER - echo " ]]>" >> $STICKER - echo " " >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - - for file in `find vad/code/fct -type f -print | grep -v CVS | cut -b14- | sort` - do - case "$file" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac - echo " " >> $STICKER - done - - for file in `find vad/vsp/fct -type f -print | grep -v CVS | cut -b13- | sort` - do - case "$file" in - *.sql) perms='110100000NN' ;; - *.vsp|*.vspx|*.php) perms='111101101NN' ;; - *) perms='110100100NN' ;; - esac - echo " " >> $STICKER - done - - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER - echo "" >> $STICKER -} - -virtuoso_init() { - LOG "Virtuoso.ini creation..." - echo " -[Database] -DatabaseFile = vad.db -TransactionFile = vad.trx -ErrorLogFile = vad.log -ErrorLogLevel = 7 -FileExtend = 200 -Striping = 0 -LogSegments = 0 -Syslog = 0 -; -; Server parameters -; -[Parameters] -ServerPort = $PORT -ServerThreads = 100 -CheckpointInterval = 0 -NumberOfBuffers = 2000 -MaxDirtyBuffers = 1200 -MaxCheckpointRemap = 2000 -UnremapQuota = 0 -AtomicDive = 1 -PrefixResultNames = 0 -CaseMode = 2 -DisableMtWrite = 0 -MaxStaticCursorRows = 5000 -AllowOSCalls = 0 -DirsAllowed = . -CallstackOnException = 1 - -; -; HTTP server parameters -; -; Timeout values are seconds -; - -[!HTTPServer] -ServerPort = $TPORT -ServerRoot = . -ServerThreads = 5 -MaxKeepAlives = 10 -EnabledDavVSP = 1 - -[Client] -SQL_QUERY_TIMEOUT = 0 -SQL_TXN_TIMEOUT = 0 -SQL_PREFETCH_ROWS = 100 -SQL_PREFETCH_BYTES = 16000 -SQL_NO_CHAR_C_ESCAPE = 0 - -[AutoRepair] -BadParentLinks = 0 -BadDTP = 0 - -[Replication] -ServerName = the_big_server -ServerEnable = 1 -QueueMax = 50000" > virtuoso.ini - - virtuoso_start -} - -vad_create() { - STICKER=$1 - V_NAME=$2 - mydir=`pwd` - do_command_safe $DSN "DB.DBA.VAD_PACK('$STICKER', '.', '$V_NAME')" - do_command_safe $DSN "commit work" - do_command_safe $DSN "checkpoint" -} - -BANNER "STARTED $VAD_DESC PACKAGING" - -$ISQL -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: $VAD_DESC PACKAGING, isql is not available" - exit 1 -fi -$SERVER -? 2>/dev/null 1>/dev/null -if [ $? -eq 127 ] ; then - LOG "***ABORTED: $VAD_DESC PACKAGING, server is not available" - exit 1 -fi - - -virtuoso_shutdown -directory_clean -directory_init -version_init -sticker_init 1 -sticker_init 0 -virtuoso_init -#vad_create $STICKER_FS $VAD_NAME_DEVEL -vad_create $STICKER_DAV $VAD_NAME_RELEASE -virtuoso_shutdown -#chmod 644 $VAD_NAME_DEVEL -chmod 644 $VAD_NAME_RELEASE - -CHECK_LOG -RUN egrep '"\*\*.*FAILED:|\*\*.*ABORTED:"' "$LOGFILE" -if test $STATUS -eq 0 -then - $myrm -f *.vad - exit 1 -fi - -directory_clean - -BANNER "COMPLETED VAD PACKAGING" -exit 0 diff --git a/binsrc/fct/opensearchdescription.vsp b/binsrc/fct/opensearchdescription.vsp index a7afb3e7ed..1dfa949f5d 100644 --- a/binsrc/fct/opensearchdescription.vsp +++ b/binsrc/fct/opensearchdescription.vsp @@ -23,7 +23,7 @@ declare uriqa_str varchar; declare favicon_path, search_image_path any; - uriqa_str := cfg_item_value (virtuoso_ini_path(), 'URIQA', 'DefaultHost'); + uriqa_str := virtuoso_ini_item_value ('URIQA', 'DefaultHost'); if (uriqa_str is null) { diff --git a/binsrc/fct/oplweb.owl b/binsrc/fct/owl/oplweb.owl similarity index 100% rename from binsrc/fct/oplweb.owl rename to binsrc/fct/owl/oplweb.owl diff --git a/binsrc/fct/rdfdesc/description.vsp b/binsrc/fct/rdfdesc/description.vsp index 904b97435a..e55b700ae9 100644 --- a/binsrc/fct/rdfdesc/description.vsp +++ b/binsrc/fct/rdfdesc/description.vsp @@ -482,16 +482,16 @@ again: - + - + diff --git a/binsrc/fct/rdfdesc/settings.vsp b/binsrc/fct/rdfdesc/settings.vsp index 84d157eccc..1e19a6bf50 100644 --- a/binsrc/fct/rdfdesc/settings.vsp +++ b/binsrc/fct/rdfdesc/settings.vsp @@ -44,13 +44,13 @@ Settings - - + + - +
diff --git a/binsrc/fct/rdfdesc/usage.vsp b/binsrc/fct/rdfdesc/usage.vsp index cff18c6f80..8962cd99c0 100644 --- a/binsrc/fct/rdfdesc/usage.vsp +++ b/binsrc/fct/rdfdesc/usage.vsp @@ -163,13 +163,13 @@ Metadata about: <?vsp http (sprintf ('%s', label)); ?> - - + + - + diff --git a/binsrc/fct/sparql.vsp b/binsrc/fct/sparql.vsp index d0eb82fc00..6e59a90e34 100644 --- a/binsrc/fct/sparql.vsp +++ b/binsrc/fct/sparql.vsp @@ -27,10 +27,10 @@ declare cookie_str, cookie_vec any; debug := get_keyword ('debug', params, case (get_keyword ('query', params, '')) when '' then '1' else '' end); - def_qry := cfg_item_value (virtuoso_ini_path (), 'SPARQL', 'DefaultQuery'); + def_qry := virtuoso_ini_item_value ('SPARQL', 'DefaultQuery'); if (def_qry is null) def_qry := 'SELECT * WHERE {?s ?p ?o} LIMIT 10'; - ini_dflt_graph := cfg_item_value (virtuoso_ini_path (), 'SPARQL', 'DefaultGraph'); + ini_dflt_graph := virtuoso_ini_item_value ('SPARQL', 'DefaultGraph'); ?> diff --git a/binsrc/fct/b3s_cl_rexec.sql b/binsrc/fct/sql/b3s_cl_rexec.sql similarity index 100% rename from binsrc/fct/b3s_cl_rexec.sql rename to binsrc/fct/sql/b3s_cl_rexec.sql diff --git a/binsrc/fct/b3sq.sql b/binsrc/fct/sql/b3sq.sql similarity index 100% rename from binsrc/fct/b3sq.sql rename to binsrc/fct/sql/b3sq.sql diff --git a/binsrc/fct/cl_prx.sql b/binsrc/fct/sql/cl_prx.sql similarity index 100% rename from binsrc/fct/cl_prx.sql rename to binsrc/fct/sql/cl_prx.sql diff --git a/binsrc/fct/complete.sql b/binsrc/fct/sql/complete.sql similarity index 100% rename from binsrc/fct/complete.sql rename to binsrc/fct/sql/complete.sql diff --git a/binsrc/fct/complete_cl.sql b/binsrc/fct/sql/complete_cl.sql similarity index 100% rename from binsrc/fct/complete_cl.sql rename to binsrc/fct/sql/complete_cl.sql diff --git a/binsrc/fct/complete_ddl.sql b/binsrc/fct/sql/complete_ddl.sql similarity index 100% rename from binsrc/fct/complete_ddl.sql rename to binsrc/fct/sql/complete_ddl.sql diff --git a/binsrc/fct/complete_single.sql b/binsrc/fct/sql/complete_single.sql similarity index 100% rename from binsrc/fct/complete_single.sql rename to binsrc/fct/sql/complete_single.sql diff --git a/binsrc/fct/complete_svc.sql b/binsrc/fct/sql/complete_svc.sql similarity index 100% rename from binsrc/fct/complete_svc.sql rename to binsrc/fct/sql/complete_svc.sql diff --git a/binsrc/fct/rdfdesc/description.sql b/binsrc/fct/sql/description.sql similarity index 100% rename from binsrc/fct/rdfdesc/description.sql rename to binsrc/fct/sql/description.sql diff --git a/binsrc/fct/facet.sql b/binsrc/fct/sql/facet.sql similarity index 99% rename from binsrc/fct/facet.sql rename to binsrc/fct/sql/facet.sql index 491bbed7fc..374b3785db 100644 --- a/binsrc/fct/facet.sql +++ b/binsrc/fct/sql/facet.sql @@ -511,10 +511,10 @@ schema:longitude rdfs:subPropertyOf geo:long . rdfs:subPropertyOf virtrdf:label . rdfs:subPropertyOf virtrdf:label . rdfs:subPropertyOf virtrdf:label . -', 'xx', 'facets'); +', 'xx', 'urn:fct:facets'); -rdfs_rule_set ('facets', 'facets'); -rdfs_rule_set ('facets', 'virtrdf-label'); +rdfs_rule_set ('facets', 'urn:fct:facets'); +rdfs_rule_set ('facets', 'urn:fct:virtrdf:label'); create procedure diff --git a/binsrc/fct/facet_agg.sql b/binsrc/fct/sql/facet_agg.sql similarity index 100% rename from binsrc/fct/facet_agg.sql rename to binsrc/fct/sql/facet_agg.sql diff --git a/binsrc/fct/facet_svc.sql b/binsrc/fct/sql/facet_svc.sql similarity index 100% rename from binsrc/fct/facet_svc.sql rename to binsrc/fct/sql/facet_svc.sql diff --git a/binsrc/fct/facet_test.sql b/binsrc/fct/sql/facet_test.sql similarity index 100% rename from binsrc/fct/facet_test.sql rename to binsrc/fct/sql/facet_test.sql diff --git a/binsrc/fct/facet_view.sql b/binsrc/fct/sql/facet_view.sql similarity index 99% rename from binsrc/fct/facet_view.sql rename to binsrc/fct/sql/facet_view.sql index 63b7cda4d3..0eec6ed140 100644 --- a/binsrc/fct/facet_view.sql +++ b/binsrc/fct/sql/facet_view.sql @@ -24,7 +24,7 @@ -- Facets web page registry_set ('_fct_xslt_', - case when registry_get('_fct_url_') = 0 then 'file://fct/' else registry_get('_fct_url_') end); + case when registry_get('_fct_url_') = 0 then 'file://fct/' else registry_get('_fct_url_') end || 'xslt/'); create procedure @@ -1423,7 +1423,7 @@ http (' declare dav_pwd varchar; declare demo_dav_path, demo_xsl_uri varchar; - uriqa_str := cfg_item_value( virtuoso_ini_path(), 'URIQA','DefaultHost'); + uriqa_str := virtuoso_ini_item_value ('URIQA','DefaultHost'); if (uriqa_str is null) { @@ -1440,7 +1440,7 @@ http (' demo_xsl_uri := registry_get ('sparql_demo_xsl_uri'); - if (0 = demo_xsl_uri) demo_xsl_uri := 'http://' || uriqa_str || '/fct/isparql_describe.xsl'; + if (0 = demo_xsl_uri) demo_xsl_uri := 'http://' || uriqa_str || '/fct/xslt/isparql_describe.xsl'; http(' - - - - - + + + + + diff --git a/binsrc/isparql/index.html b/binsrc/isparql/index.html index ae182f9b29..92288b01dc 100644 --- a/binsrc/isparql/index.html +++ b/binsrc/isparql/index.html @@ -48,15 +48,15 @@ "rdfmini","map","json"]; - - - - - - - - - + + + + + + + + +
Host & Domain Name
Listening Interface + + + +
@@ -193,7 +203,7 @@
TCP Port
Default Mail Server
SMTP Server for Data Space Applications
Default Graph IRI - +
+ + + + + + + + + + + " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " + + + + + + + + + + + +" >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo " " >> $STICKER - echo "