Merge branch 'release/7.2.14' into stable/7

openlink · Nov 11, 2024 · ffed467 · ffed467
2 parents a1fd819 + 36b81d3
commit ffed467
Show file tree

Hide file tree

Showing 130 changed files with 2,663 additions and 2,946 deletions.
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS.md b/NEWS.md
diff --git a/README.GIT.md b/README.GIT.md
@@ -85,7 +85,7 @@ installed on your system.
 | 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.2.x  | http://www.openssl.org/               |
+| OpenSSL   | 0.9.8e  | 3.3.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
@@ -57,7 +57,7 @@ installed on your system.
 | 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.2.x  | http://www.openssl.org/               |
+| OpenSSL  | 0.9.8e  | 3.3.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/binsrc/Makefile.am b/binsrc/Makefile.am
@@ -19,12 +19,21 @@
 #  
 #  
 
-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 
+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 
 
 
 # ----------------------------------------------------------------------
 #
 #  Additional files to distribute
 #
 # ----------------------------------------------------------------------
-EXTRA_DIST = config/ccdefs.c config/libxml.m4
+EXTRA_DIST = \
+	$(srcdir)/config/ccdefs.c \
+	$(srcdir)/config/libxml.m4 \
+	$(srcdir)/vadpacker/*.py \
+	$(srcdir)/vadpacker/.gitignore \
+	$(srcdir)/vadpacker/AUTHORS \
+	$(srcdir)/vadpacker/ChangeLog \
+	$(srcdir)/vadpacker/COPYING \
+	$(srcdir)/vadpacker/NEWS \
+	$(srcdir)/vadpacker/README
diff --git a/binsrc/conductor/dav/dav_browser.js b/binsrc/conductor/dav/dav_browser.js
@@ -1405,14 +1405,8 @@ WEBDAV.menuMouseOut = function (event)
     return false;
   }
 
-  if (window.event)
-  {
-    current = this;
-    related = window.event.toElement;
-  } else {
-    current = event.currentTarget;
-    related = event.relatedTarget;
-  }
+  current = event.currentTarget;
+  related = event.relatedTarget;
   if ((current != related) && !menuMouseIn(current, related))
     OAT.Dom.hide(current);
 }

diff --git a/binsrc/conductor/dav/dav_browser.sql b/binsrc/conductor/dav/dav_browser.sql
@@ -2524,7 +2524,7 @@ create procedure WEBDAV.DBA.settings_tbLabels (
 create procedure WEBDAV.DBA.settings_hiddens (
   inout settings any)
 {
-  return get_keyword ('hiddens', settings, '.,_');
+  return get_keyword ('hiddens', settings, '.');
 }
 ;
 
@@ -3292,6 +3292,8 @@ create procedure WEBDAV.DBA.DAV_PERROR (
     S := replace (S, 'Resource', 'File');
     S := subseq (S, 6);
   }
+  if (-44 = x and isstring (connection_get('__sql_message')))
+    S := connection_get('__sql_message');
   return S;
 }
 ;

diff --git a/binsrc/conductor/db_rdf_view_3.vspx b/binsrc/conductor/db_rdf_view_3.vspx
@@ -338,7 +338,7 @@
 		   exec (qr, stat, msg, vector (), 0, meta, data);
 		   if (stat = '00000' and length (data) and length (data[0]))
 		     {
-		     http (sprintf ('<div>Transient Views: <a href="/describe/?uri=%U"i target="_blank">%V</a> <br/>', gr, gr));
+                  http (sprintf ('<div>Transient Views: <a href="/describe/?uri=%U" target="_blank">%V</a> <br/>', gr, gr));
 		       foreach (any _row in data) do
 			 {
 			   if (_row[0] not like '%/stat#%')

diff --git a/binsrc/conductor/vad_version b/binsrc/conductor/vad_version
@@ -1 +1 @@
-1.00.8869
+1.00.8871
diff --git a/binsrc/fct/bbc_demo_queries.vsp b/binsrc/fct/bbc_demo_queries.vsp
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC
-  "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <title>BBC demo queries</title>
 <link rel="stylesheet" type="text/css" href="/fct/css/default.css"/>
 <script type="text/javascript" src="s/main.js"></script>

diff --git a/binsrc/fct/css/default.css b/binsrc/fct/css/default.css
@@ -608,9 +608,11 @@ a.desc_permalink { font-size: 9pt; font-weight: normal }
 
 #fct_form { margin-top: 1ex }
 
-.addthis_toolbox { margin: 20px 10px auto; }
-
-#FT_share .addthis_toolbox { margin: 0 }
-
 img.dicon { border-width:0; height:20px; vertical-align: middle; }
 
+div.content.embedded > iframe { resize: auto; }
+div.content.embedded { resize: auto; overflow: auto; }
+
+.text-nowrap {
+  white-space: nowrap;
+}
diff --git a/binsrc/fct/css/style.css b/binsrc/fct/css/style.css
@@ -74,4 +74,3 @@ a.rdf_source img { vertical-align: middle;margin-right: 5px;}
 #ft_r { float: right;}
 #ft_l label { margin-right: 5px;}
 
-div.content.embedded { padding: 0.25em; height: 105%; margin-bottom: 1em; display: block; float: none; clear: both; }
diff --git a/binsrc/fct/demo_queries.vsp b/binsrc/fct/demo_queries.vsp
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC
-  "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <title>BBC demo queries</title>
 <link rel="stylesheet" type="text/css" href="/fct/css/default.css"/>
 <script type="text/javascript" src="oat/toolkit/loader.js"></script>

diff --git a/binsrc/fct/facet.vsp b/binsrc/fct/facet.vsp
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <title>Precision Search &amp; Find</title>
 
 <?vsp
@@ -31,7 +30,7 @@
     pageUrl := pageUrl || '?' || query_str;
 
 ?>
-  <link rel="stylesheet" type="text/css" href="<?=main_ss?>"  charset="utf-8" />
+  <link rel="stylesheet" type="text/css" href="<?=main_ss?>" />
 
 <?vsp
   fct_gen_opensearch_link();

diff --git a/binsrc/fct/facet_doc.html b/binsrc/fct/facet_doc.html
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html>
+<html lang="en">
 <!--
 --
 --  $Id$
@@ -22,12 +23,10 @@
 --  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 --
 -->
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <?vsp set http_charset='utf-8'; ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 <title>Entity Search, Find, and Explore - Documentation</title>
 <link rel="stylesheet" media="screen" type="text/css" href="/fct/css/default.css"/>
 <script type="text/javascript" >
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,4 +74,3 @@ a.rdf_source img { vertical-align: middle;margin-right: 5px;}
		#ft_r { float: right;}
		#ft_l label { margin-right: 5px;}

		div.content.embedded { padding: 0.25em; height: 105%; margin-bottom: 1em; display: block; float: none; clear: both; }